2010/6/18 Francisco Vila
<paconet.org@gmail.com>
2010/6/18 Federico Bruni <fedelogy@xxxxxxxxx>:
> I've commited the changes made two days ago (which hopefully will fix the
> warnings of 'make website').
> Then I run git pull -r
>
> But I have conflicts (see below).
You'll have to resolve them. Need advice on this? If it's not in the
CG, we can talk about it here.
Basically, it's choosing one off both alternatives marked with
<<<<<<<< in your files, then committing the result.
The CG points to a section of the git-merge manual.
I'm reading it but I can't understand how can I see these differences marked with <<<<<<<<<<<<<
Hint?
> Also, how can I add the last few changes to the existing patch?
You don't modify existing patches; rather you create new ones.
git format-patch <from>..<until>
ok, so I'll create a second patch when I have fixed the conflicts of the first one... right?