Home » Mailing list archives » git » 2006 » November » 17

Re: [DRAFT] Branching and merging with git

Previous thread: [RFC] gitweb TODO by Jakub Narebski on Friday, November 17, 2006 - 2:01 pm. (6 messages)

Next thread: Re: [DRAFT] Branching and merging with git by Petr Baudis on Friday, November 17, 2006 - 5:31 pm. (4 messages)
[view original message]
From: Jakub Narebski <jnareb@...>
To: <git@...>
Subject: Re: [DRAFT] Branching and merging with git
Date: Friday, November 17, 2006 - 2:16 pm

But it is encouraged (also for example by git-completion.bash) to use

"git foo" form in command line (because git commands can be not in the PATH,


It would be useful to cover all non-reductible cases of recursive merge

strategy (the default merge strategy for two-head merges) conflicts:

contents (covered), add/add, rename/modify etc.


So some info about recirsive merge strategy would be useful.


--

Jakub Narebski

Warsaw, Poland

ShadeHawk on #git


-
Previous thread: [RFC] gitweb TODO by Jakub Narebski on Friday, November 17, 2006 - 2:01 pm. (6 messages)

Next thread: Re: [DRAFT] Branching and merging with git by Petr Baudis on Friday, November 17, 2006 - 5:31 pm. (4 messages)