From: Linus Torvalds Date: Wed, 21 Sep 2005 22:03:39 GMT Subject: Re: Please undo "Use git-merge instead of git-resolve in git-pull" Message-ID: In-Reply-To: <7vu0genlc1.fsf@assigned-by-dhcp.cox.net> On Wed, 21 Sep 2005, Junio C Hamano wrote: > > * I thought you do not multitask and wonder why you are merging > while you still have local changes, but that does not justify > this regression. I've always multi-tasked, but when I started git I was ready to drop it. Then I came up with that wonderful "merge in the index" approach, and I could do it again, and I was _soo_ happy. I often have local changes in my tree that I don't want to commit but that I'm testing out. Havign them interfere with merging other peoples work would mean that I'd have to have a totally separate tree for that, which I could do, but I'm much much happier not having to. Linus