Re:Distrusting git
by InclinedPlane on Saturday October 01, 2011 @04:31PM
(#3061029)
Definitely. However, this highlights a problem with git, it should naturally guide you to best practices. Unfortunately, with git it's quite easy to fall into a natural and comfortable seeming pattern of use that has some very negative downsides, such as the author of the article experienced.
[ Parent
| on HN ]
Re:Distrusting git
by bennoleslie on Saturday October 01, 2011 @08:28PM
(#3061610)
Exactly, in fact it normally does. git pull is actually really useful for enforcing this most of the time. If you inadvertently do a 'git pull' before doing a commit, and you have any overlapping changes, then git aborts the merge. This is why 'git pull' is generally a safe operation.