Repository navigation
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
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.
Problem
When an MR is merged on GitLab, the MRs still open on an older
mainconflict with it. Once migrated, their pull requests had no conflict on GitHub.They were replayed on top of the latest
maininstead of the commit they started from. Their commits kept their original files, so they reverted everything merged since: each pull request showed every change of the merged MR.Fix
Each open MR is now replayed on the copy of the commit it started from, so its pull request shows the same commits, files and conflicts as on GitLab. This also covers MRs opened before every merged MR and MRs created from a branch merged since.