Cherry-pick merge-commits #7404
Merged
+182
−46
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
|
@Byron is attempting to deploy a commit to the GitButler Team on Vercel. A member of the Team first needs to authorize it. |
Now that the 'old' code uses the new cherry-pick just for good measure, it needs to be functionally equivalent. This also means that it has to be able to cherry-pick merge commits, something which should just work. The re-merge we can only do if it's our workspace commits, but even then a cherry-pick should be enough. One step at a time though. NOTE: this doesn't trivially work.
This reverts commit 2c685f3. A revert is necessary because it's not working without further changes.
…tlerapp#7396). That way, cherry-picks will be performed as usual.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now that the 'old' code uses the new cherry-pick just for good measure, it needs to be functionally equivalent. This also means that it has to be able to cherry-pick merge commits, something which should just work.
The re-merge we can only do if it's our workspace commits, but even then a cherry-pick should be enough. One step at a time though.
Note: Doing this breaks rebase tests, so it's easier to go with bringing back the previous code. It's worth noting that Git also will merely redo merges, instead of picking them, which to my mind seems to be a correct way of doing things. Here is an example:
Example taken from https://www.olivare.net/blog/2024/git-rebase-merges .
It would have the disadvantage that it won't reproduce conflict resolutions that were made to the merge commit, forcing the user to re-merge. Cherry-picking has a chance of carrying those over as well.
Fixes #7396.