Re: Effective difference between git-rebase and git-resolve

Marc Singer [off-list ref] writes:

quoted

	git merge "Merge with Linus" work linus

instead, which will use the proper "recursive" merge functionality.

OK.  I'll see if that is more successful.  It would be nice if the
resolve command printed a message about the command being deprecated.

The only reason I didn't do that was because I just did not want
to disrupt the workflow by Linus.  If nobody in the upper
echelon of kernel people (meaning, longest-time git users) use
git-resolve anymore, I think we should mark it deprecated and
remove it eventually.

Hi,

On Fri, 24 Mar 2006, Junio C Hamano wrote:

If nobody in the upper echelon of kernel people (meaning, longest-time 
git users) use git-resolve anymore, I think we should mark it deprecated 
and remove it eventually.

I am nowhere near kernel people, but I am using git on a machine where it 
is too cumbersome to install python. If git-resolve goes, I am without a 
merge strategy (at least until git-recursive is ported to C... was that 
not the plan with git-merge-tree? What happened on that front?).

Ciao,
Dscho

Johannes Schindelin [off-list ref] wrote:

I am nowhere near kernel people, but I am using git on a machine where it 
is too cumbersome to install python. If git-resolve goes, I am without a 
merge strategy (at least until git-recursive is ported to C... was that 
not the plan with git-merge-tree? What happened on that front?).

Err... git-resolve isn't the same as git-merge-resolve.  The latter is a
stupid merge strategy which fits into the git-merge/git-pull
infrastructure.  The former is a different program which does merges
badly, and you didn't want to use it even if you don't have Python!

I'd forgotten all about git-resolve until it got mentioned just now.

-- [mdw]

Hi,

On Sat, 25 Mar 2006, Mark Wooding wrote:

Johannes Schindelin [off-list ref] wrote:

quoted

I am nowhere near kernel people, but I am using git on a machine where it 
is too cumbersome to install python. If git-resolve goes, I am without a 
merge strategy (at least until git-recursive is ported to C... was that 
not the plan with git-merge-tree? What happened on that front?).

Err... git-resolve isn't the same as git-merge-resolve.

Oooops.

Thank you,
Dscho