Support octopus merge - Githubissues

guberm / tortoisegit

Automatically exported from code.google.com/p/tortoisegit

0 stars 0 forks source link

Support octopus merge #775

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago

What steps will reproduce the problem?
1. Try to achieve an octopus merge without using the command line

What version of the product are you using? On what operating system?
TortoiseGit 1.6.5.0 
git version 1.7.3.1.msysgit.0

Original issue reported on code.google.com by robert.p...@gmail.com on 11 Apr 2011 at 8:20

GoogleCodeExporter commented 9 years ago

what's means of "octopus merge"

Original comment by lzn...@gmail.com on 11 Apr 2011 at 8:24

Changed state: Discuss

GoogleCodeExporter commented 9 years ago

Merging more than two parents, see the git-merge manpage.

Original comment by robert.p...@gmail.com on 11 Apr 2011 at 8:29

GoogleCodeExporter commented 9 years ago

The problem here is handling merge conflicts.
See https://github.com/TortoiseGit/TortoiseGit/pull/28

Original comment by sstrickr...@googlemail.com on 15 Sep 2013 at 3:42