Created
December 19, 2023 09:05
-
-
Save Rakonda/c6d85aaa3ce18e7d18bc6dd0277a6fd7 to your computer and use it in GitHub Desktop.
Fix git merge request shows changes from another merge request
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
| Go to your master branch and do a "git pull" | |
| Switch back to your branch you are merging and do "git rebase origin/master -i" | |
| Solve any conflicts that arise and fix any commits as needed in VIM and exist ":wq" | |
| After the rebase is completed do a "git push origin [your branch name] --force" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment