Re: [translations] italian website PATCH

[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).
Also, how can I add the last few changes to the existing patch?

Thanks for your help

#######################################################################


First, rewinding head to replay your work on top of it...
Applying: Web-it: add italian translation
Using index info to reconstruct a base tree...
<stdin>:2107: trailing whitespace.
delle funzionalità tipografiche più avanzate, come la ripartizione di travature 
<stdin>:3404: trailing whitespace.
Quasi tutte le funzionalità di formattazione usate internamente sono 
<stdin>:365: new blank line at EOF.
+
<stdin>:1265: new blank line at EOF.
+
<stdin>:2944: new blank line at EOF.
+
warning: 5 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging Documentation/it/web/community.itexi
CONFLICT (add/add): Merge conflict in Documentation/it/web/community.itexi
Auto-merging Documentation/it/web/download.itexi
CONFLICT (add/add): Merge conflict in Documentation/it/web/download.itexi
Auto-merging Documentation/it/web/introduction.itexi
CONFLICT (add/add): Merge conflict in Documentation/it/web/introduction.itexi
Auto-merging Documentation/it/web/manuals.itexi
CONFLICT (add/add): Merge conflict in Documentation/it/web/manuals.itexi
Auto-merging scripts/build/website_post.py
CONFLICT (content): Merge conflict in scripts/build/website_post.py
Failed to merge in the changes.
Patch failed at 0001 Web-it: add italian translation

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".