git cherry-pick is your friend and we love our friends
-
-
Show this threadThanks. Twitter will use this to make your timeline better. UndoUndo
-
-
-
Seriously I will spend an hour in “git rebase -i” if it avoids 10 minutes spent resolving merge conflicts. The struggle is real.
Thanks. Twitter will use this to make your timeline better. UndoUndo
-
-
-
Whenever I get frustrated with git I remember how it's a British slang insult and I imagine typing "asshat checkout master" and I feel better
Thanks. Twitter will use this to make your timeline better. UndoUndo
-
-
-
If you haven’t already, take a look at IntelliJ (including free community edition). The split screen color coded merge view makes it easier
Thanks. Twitter will use this to make your timeline better. UndoUndo
-
-
-
Have you explored merge tooling?
Thanks. Twitter will use this to make your timeline better. UndoUndo
-
Loading seems to be taking a while.
Twitter may be over capacity or experiencing a momentary hiccup. Try again or visit Twitter Status for more information.