Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement merge commits #8

Open
SamuelSchlesinger opened this issue May 3, 2023 · 2 comments
Open

Implement merge commits #8

SamuelSchlesinger opened this issue May 3, 2023 · 2 comments
Labels
enhancement New feature or request

Comments

@SamuelSchlesinger
Copy link
Owner

Currently, all commits can technically have more than one previous commit, but when you run revtool snap it only adds the one from the branch. We need a command like: revtool merge <branch> which will try to bring in the changes from that branch into this one. revtool rebase <branch> would be a nice to have as well.
@SamuelSchlesinger SamuelSchlesinger added the enhancement New feature or request label May 3, 2023
@SamuelSchlesinger
Copy link
Owner Author

SamuelSchlesinger commented May 3, 2023 •
edited
Loading

This probably is blocked by #3 because you'll need to resolve diffs in the case of a conflict.

@SamuelSchlesinger
Copy link
Owner Author

Part of me wants to just do rebases instead? I guess merges are more history-preserving, but I always use rebase in practice.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@SamuelSchlesinger