Bug 24629 - В списке стратегий merge отсутствует theirs
: В списке стратегий merge отсутствует theirs
Status: CLOSED NOTABUG
: Sisyphus
(All bugs in Sisyphus/git)
: unstable
: all Linux
: P3 minor
Assigned To:
:
:
:
:
:
  Show dependency tree
 
Reported: 2010-11-24 00:45 by
Modified: 2010-11-24 00:51 (History)


Attachments


Note

You need to log in before you can comment on or make changes to this bug.


Description From 2010-11-24 00:45:14
git merge 4.0-ready -s theirs
Could not find merge strategy 'theirs'.
Available strategies are: octopus ours recursive resolve subtree.

Причем в мануале она есть
------- Comment #1 From 2010-11-24 00:49:26 -------
"The recursive strategy can take the following options", сказано в мануале.
------- Comment #2 From 2010-11-24 00:51:31 -------
Т.е. -s recursive -X theirs