threads / discuss / 167

Re: [darcs-devel] Darcs and git: plan of action

Subject: Re: [darcs-devel] Darcs and git: plan of action

## tl;dr

One message between Apr 20, 2005 and Apr 20, 2005.

replies: 0people: 1as markdown or json

Juliusz Chroboczek· Apr 20, 2005, 07:55 UTC · lore
> We're talking about interoperating with a Git repository here,
> right?  Even if we got the metadata in there, doesn't Git have to
> understand a replace patch for things to work out?
> 0. All three are in sync to begin with.
> 1. CC creates a token-replace patch, sends the changes in normal hunk
> format to AA.
> 2. BB makes changes, sends a normal hunk patch to AA and CC.  AA will
> apply the hunk normally.  For CC the token replace might apply here
> and so the result could be different.
3. when AA and CC try to sync, they will get spurious merge conflicts.
> Isn't this a potential problem?

It is. In a heterogeneous environment they will get spurious merge conflicts.

                                        Juliusz

← back to recent threads