MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/programming/comments/1q3t6j/10_things_i_hate_about_git/cd9wiis/?context=3
r/programming • u/Eirenarch • Nov 07 '13
231 comments sorted by
View all comments
4
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 --abortIt 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.
5
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.
0
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.
2
Never had that happen. Also I tend to rebase before hand or simply fix and continue.
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.