Re* BUG: merge -s theirs is not in effect (does the same as -s ours)

2017-09-24 Thread Junio C Hamano
Yaroslav Halchenko writes: > d'oh, indeed there is no git-merge-theirs neither in debian pkg or a freshly > built git and I found a rogue script in the PATH (which did nothing > apparently, sorry!). BUT I was originally mislead by the --help/manpage: Ahh, you're right. The text does make read

Re: BUG: merge -s theirs is not in effect (does the same as -s ours)

2017-09-24 Thread Yaroslav Halchenko
On Mon, 25 Sep 2017, Junio C Hamano wrote: > Yaroslav Halchenko writes: > > My interest was to get remote branch "merge" the changes in the > > branch taking the branch's version (primarily alternative symlinks > > for git-annex'ed content) over the version in master (previous > > merge of a si

Re: BUG: merge -s theirs is not in effect (does the same as -s ours)

2017-09-24 Thread Junio C Hamano
Yaroslav Halchenko writes: > My interest was to get remote branch "merge" the changes in the > branch taking the branch's version (primarily alternative symlinks > for git-annex'ed content) over the version in master (previous > merge of a similar branch). Unfortunately -s theirs seems to do > a