Re: [PATCH]Re: tempoMark - documentation and use

[John Mandereau]

Jonathan Kulp a écrit :
> The conflicting files are exactly the ones I modified to create the 
> patch.  True, the CG guide has a section on conflict resolution but 
> it's not finished yet.
This is true the CG is not finished, but I don't see the need to add 
anything to this section, as the referenced Git man page sectionns 
explain it quite clearly to me.
If after reading these man pages sections you still don't know how to 
resolve the conflict, then we may provide some help.

> I'll fiddle with it later and see if I can resolve it.  As long as it 
> didn't mess up anyone else's sources I'm not too worried about it though.
You might want to take this as training for the future time when you get 
git push access ;-)

Cheers,
John