Bug 24629 - В списке стратегий merge отсутствует theirs
Summary: В списке стратегий merge отсутствует theirs
Status: CLOSED NOTABUG
Alias: None
Product: Sisyphus
Classification: Development
Component: git (show other bugs)
Version: unstable
Hardware: all Linux
: P3 minor
Assignee: placeholder@altlinux.org
QA Contact: qa-sisyphus
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-11-24 00:45 MSK by nbr
Modified: 2010-11-24 00:51 MSK (History)
3 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description nbr 2010-11-24 00:45:14 MSK
git merge 4.0-ready -s theirs
Could not find merge strategy 'theirs'.
Available strategies are: octopus ours recursive resolve subtree.

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