From: Caleb Cushing <xenoterracide@gmail.com>
Date: Tue, 02 Dec 2008 13:46:00 GMT
Subject: Re: more merge strategies : feature request
Message-ID: <81bfc67a0812020546o79906a20jcd04bd42d18dd803@mail.gmail.com>
In-Reply-To: <ee2a733e0812011849l1b319c96u9abbb4e8dd4f53ce@mail.gmail.com>

> I guess that "no-overwrite" can be achieved by
>
>  git merge -s ours --no-commit

no it doesn't. which is why I called it a bad name. no-overwrite would
still add new lines to the file not in ours (and no-commit isn't
needed in that case) it just wouldn't overwrite conflicting lines, my
understanding of ours is that it will keep the files as is.
Caleb Cushing