http://blog.ezyang.com/2010/01/advanced-git-merge/ Existential Pontification and Generalized Abstract Digressions Sun, 05 Feb 2012 23:02:11 +0000 hourly 1 http://wordpress.org/?v=3.3.1 http://blog.ezyang.com/2010/01/advanced-git-merge/comment-page-1/#comment-2001 Using GIT with SVN | Justin Carmony Thu, 07 Apr 2011 21:34:33 +0000 http://ezyang.scripts.mit.edu/blog/?p=171#comment-2001 [...] Five advanced Git merge techniques - Five more advanced tricks with Git and merging, not sure if I’ll actually use all of them. [...] [...] Five advanced Git merge techniques – Five more advanced tricks with Git and merging, not sure if I’ll actually use all of them. [...]

]]> http://blog.ezyang.com/2010/01/advanced-git-merge/comment-page-1/#comment-1855 Fredrik Fri, 04 Mar 2011 07:50:56 +0000 http://ezyang.scripts.mit.edu/blog/?p=171#comment-1855 Rebase is awesome, but beware that it does rewrite your history. You should only rebase stuff you haven't pushed anywhere. Rebase is awesome, but beware that it does rewrite your history. You should only rebase stuff you haven’t pushed anywhere.

]]> http://blog.ezyang.com/2010/01/advanced-git-merge/comment-page-1/#comment-1668 tedm Sat, 18 Dec 2010 23:40:25 +0000 http://ezyang.scripts.mit.edu/blog/?p=171#comment-1668 Thanks! I didn't know about the diff3 option. That's made my life a lot easier! Thanks! I didn’t know about the diff3 option. That’s made my life a lot easier!

]]> http://blog.ezyang.com/2010/01/advanced-git-merge/comment-page-1/#comment-1143 cbemerine Sat, 11 Sep 2010 22:37:04 +0000 http://ezyang.scripts.mit.edu/blog/?p=171#comment-1143 Excellent article and a good refresher! Excellent article and a good refresher!

]]>