Get back my conflict state!
Posted Updated 
By Berk Akgun
1 min read
How to Bring Back Your Merge Conflict State
I love using tig to simplify my Git workflow — browsing status, un/staging files, and juggling branches feels much smoother.
But every now and then, after resolving a merge conflict, I catch myself wondering: Did I actually fix this the right way?
That’s when Git reminds me it’s a universe of hidden tricks, always ready to teach me something new.
Today I Learned (TIL):
If you want to get your merge conflict markers back to its original state, just run:
1
git checkout --merge <filepath>
This post is licensed under CC BY 4.0 by the author.