Re: git pull suggestion
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:48:36
Aghiles [off-list ref] writes:
On Sun, Apr 11, Junio C Hamano [off-list ref] wrote:quoted
... The other answer would initially appear a bit sad, but after you think about it, it would turn into an enlightenment, especially for people whose brains have rotten from years and years of CVS/SVN use.My brain was rotten even _before_ CVS/SVN use, so you can picture the damage.
Please don't take that too seriously; it was just me imitating these:
http://www.youtube.com/watch?v=4XpnKHJAok8
https://git.wiki.kernel.org/index.php/LinusTalk200705Transcript
;-)
quoted
... so I'll leave that as an exercise to the readers but will leave a pictorial hint.Before I start thinking I already have a question (which says a lot about my thinking capacity): can't git detect this problematic case?
The pictorial hint is to illustrate that the case is not necessarily problematic.