Make it clear that the merge strategy will discard all changes made to the branch being merged, and not just avoid creating merge conflicts. --- Documentation/merge-strategies.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) > If you want to use any merge strategy, you must understand what it does > first. Indeed. Perhaps this clarification will help the next poor soul that tries doing what I tried? diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 4365b7e..a340dc9 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -30,7 +30,8 @@ octopus:: ours:: This resolves any number of heads, but the result of the - merge is always the current branch head. It is meant to + merge is always the current branch head, discarding any + changes on the merged branch. It is meant to be used to supersede old development history of side branches. -- 1.6.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html