Summary: | В списке стратегий merge отсутствует theirs | ||
---|---|---|---|
Product: | Sisyphus | Reporter: | nbr <nbr> |
Component: | git | Assignee: | placeholder <placeholder> |
Status: | CLOSED NOTABUG | QA Contact: | qa-sisyphus |
Severity: | minor | ||
Priority: | P3 | CC: | glebfm, ldv, placeholder |
Version: | unstable | ||
Hardware: | all | ||
OS: | Linux |
Description
nbr
2010-11-24 00:45:14 MSK
"The recursive strategy can take the following options", сказано в мануале. Т.е. -s recursive -X theirs |