hot tip: git config --global merge.conflictstyle diff3 "what does it do" shh. change your life, that's what
-
Show this thread
-
normally in a merge conflict, you only see what /you/ have and what /they/ have. in an ugly merge (or, god forbid, a really bad rebase) this can be not helpful at times diff3 adds what you /both started with/ in the middle
5 replies 17 retweets 107 likesShow this thread
Replying to @eevee
I live to paste random strings into bash, ty
9:52 AM - 20 Feb 2018
0 replies
0 retweets
1 like
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.