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
Example: You have a branch 'refactor' that is quite different from master. You can't merge all of the | |
commits, or even every hunk in any single commit or master will break, but you have made a lot of | |
improvements there that you would like to bring over to master. | |
# on master | |
> git branch -m original_refactor refactor # <== completely optional but part of my flow | |
> git co -b temp | |
# on temp | |
> git merge --no-commit --no-ff refactor |