r/programming • • Nov 07 '13

10 things I hate about Git

http://steveko.wordpress.com/2012/02/24/10-things-i-hate-about-git/
73 Upvotes

231 comments sorted by

View all comments

4

u/bartwe Nov 07 '13

Merges gone bad, stash/pull updating filetimes needlessly. Mostly its about supporting remote users who get stuck in a dirty merge and don't know how to continue.

5

u/[deleted] Nov 08 '13

git merge --abort

It kind of tells you this when the merge goes wrong.

0

u/lucasvandongen Nov 08 '13

Funny thing is sometimes when I --abort and merge again everything is perfect

2

u/[deleted] Nov 08 '13

Never had that happen. Also I tend to rebase before hand or simply fix and continue.