So you're rebasing and you resolve a conflict wrong? `git checkout --conflict=merge <FILE>` to get it back to its conflicted state. #gittips
Replying to @zkat__
@maybekatz @emilymhorsman that's way better than `git reset --hard` and crying softly into my keyboard
7:35 PM - 17 Dec 2015
from Mexico
0 replies
2 retweets
9 likes
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.