> "Sure, but you hit the problem twice as often in git, because you have to do twice as many things."
Well no, I don't...
If this really is a frequent problem for you, then you might want to consider adding a note to the end of git-commit's output to remind you to push, or even just aliasing git-commit to push by default. I would recommend that you instead learn how to use git, but failing that...
> "In SVN that doesn't show up as a merge in the history."
If you don't want to resolve those situations with a merge, then don't resolve those situations with a merge... Rebasing exists for a reason.
Re:Bzr is dying; Emacs needs to move
by NickNameNick on Thursday January 02, 2014 @08:02PM
(#7003596)
In SVN, that shows up as a conflict which has to be merged by hand. 'git rebase' and/or 'git mergetool' are nicer.
Sure, but you hit the problem twice as often in git, because you have to do twice as many things.
> If you forget to check for updates... well that is something that happens in other centralized schemes as well. You figure it out when you go to push and it fails, you correct it, then you are good to go.
In SVN that doesn't show up as a merge in the history.