nader's thinkery

You’re in the middle of a conflicted merge (git) « 42

You’re in the middle of a conflicted merge (git) « 42

url git reset tutorial Dec 20, 2010
Extracted Page: http://www.42.mach7x.com/2009/11/24/youre-in-the-middle-of-a-conflicted-merge-git/
You’re in the middle of a conflicted merge (git) « 42

Additional text has been truncated due to copyright reasons. Things without URLs and private things don't get truncated.