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

[Jonathan Kulp]

John Mandereau wrote:
> Jonathan Kulp a écrit :
> > Ugh.  I have a merge conflict upon pulling.  Did I mess up the patch?
> What are the conflicting files? Your patch is the last commit on master, 
> so if Trevor applied it without amending it, the conflict is likely 
> related to changes other than this patch you made locally.
> You certainly already know the Contrib Guide has a paragraph or section 
> about solving conflicts.
>
> Best,
> John

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. 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.

Jon
--
Jonathan Kulp
http://www.jonathankulp.com