On Mon, 25 Sep 2017, Junio C Hamano wrote: > Yaroslav Halchenko <yoh@xxxxxxxxxxxxxx> 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 readers expect "-s theirs" to > exist. > ... > * I hope this should help things a bit. yes it does. Thanks. And that is where I realized that I should have used -X theirs (not -s theirs), as the instruction on the option for the (recursive) merge. And now problem is more specific: - conflict within file content editing was resolved as instructed (taking "theirs" version) - BUT symlink was not taken from "theirs" and left as unresolved conflict: $> rm -rf /tmp/repo1; mkdir /tmp/repo1; cd /tmp/repo1; git init .; ln -s sym1 link; echo 1 > file; git add file link; git commit -m 'common'; git co -b b1 ; ln -sf b1link link; echo "b1 file" >| file; git commit -m 'b2 changes' -a; git co master; ln -sf masterlink link; echo "master file" >| file; git commit -m 'also modified in master' -a; git merge -X theirs --no-edit b1; ls -l link; cat file warning: templates not found /home/yoh/share/git-core/templates Initialized empty Git repository in /tmp/repo1/.git/ [master (root-commit) f0b75bc] common 2 files changed, 2 insertions(+) create mode 100644 file create mode 120000 link Switched to a new branch 'b1' [b1 45c93ca] b2 changes 2 files changed, 2 insertions(+), 2 deletions(-) Switched to branch 'master' [master 0ee6db2] also modified in master 2 files changed, 2 insertions(+), 2 deletions(-) Auto-merging link CONFLICT (content): Merge conflict in link Auto-merging file Automatic merge failed; fix conflicts and then commit the result. lrwxrwxrwx 1 yoh yoh 10 Sep 25 10:21 link -> masterlink b1 file changes on filesystem: link | Unmerged cached/staged changes: file | 2 +- link | Unmerged PS I will followup on -s theirs in a split thread PSS Thanks for CCing me your replies -- Yaroslav O. Halchenko Center for Open Neuroscience http://centerforopenneuroscience.org Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik
