Created
December 5, 2019 09:56
-
-
Save LolWalid/0d0144c25e803461d2fba86856199cfa to your computer and use it in GitHub Desktop.
Git Rebase
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
| # fetch data from master | |
| git co master | |
| git pull origin master | |
| git co feature/branch | |
| git rebase -i diverged_commit | |
| # Keep only the first commit (the upper one, dont know why...) | |
| git rebase master | |
| # solve conflict | |
| git add . | |
| git rebase --continue |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment