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.