Re: VC mode and git

[Sergey Organov]

Harald Hanche-Olsen <address@hidden> writes:

> Sergey Organov wrote:
>> Eli Zaretskii<address@hidden>  writes:
>>> A merge does much more than just commit.  At least AFAIU.
>>
>> Dunno what you have in mind. After true merge operation is finished, the
>> only result of it is single commit appended to your current branch. Git
>> /is/ that simple. All the possible complexity is in the stage of content
>> preparation for this commit.
>
> Yes, but that complexity can be considerable. Isn't it reasonable to
> assume that that is what Eli had in mind?

I prefer not to assume if I can ask.

We seem to discuss git, not complexity of content merge algorithms.

Maybe Eli has some ideas about something else git does besides
committing resulting changes, how do I know?

-- Sergey.