Use merge instead of rebase to sync other developers' changes in basic mode #504
Conversation
This file contains hidden or 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
isc-tleavitt
requested changes
Oct 1, 2024
There was a problem hiding this comment.
@isc-pbarton we're going to need a corresponding update to SourceControl.Git.Util.ProductionConflictResolver:Resolve to change rebase --continue to merge --continue.
In general I prefer the idea of rebasing over merging from a history/tracking perspective, especially for cases where we're using the deployment manager on top of the main branch; merges are going to end up being deceptive. Is it possible to just fix the diff command?
|
That's fair, I'll look into fixing the diff instead. |
|
I have not used basic mode at all but I too prefer rebasing over merging or at the very least having a choice. |
|
Going to close this out and create a new merge request with the rebase fix. |
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.
Fixes #503
The logic we were using previously to list files that needed to be imported after a rebase was broken. This change fixes it by using a merge instead of a rebase. We originally went with rebase because the git commit history looks nicer that way, but I think merge is going to be a lot simpler to support.