2010/6/18 Francisco Vila
<paconet.org@gmail.com>
>> 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?
Yes but firstly focus on
- making a commit after which 'git status' does not show weird messasges
- make sure you are in the right branch
- git pull -r
and if everything goes well, make a patch.
Ok, I've fixed the conflicts in the files.
Then I run git rebase --continue and Git applyed the two commits I made (see the output below).
Is it OK? Should I just create the second patch for the second commit?
Should I use 'git format-patch origin'?
###############################
fede@debian:~/lilypond-translation$ git status
# Not currently on any branch.
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both added: Documentation/it/web/community.itexi
# both added: Documentation/it/web/download.itexi
# both added: Documentation/it/web/introduction.itexi
# both added: Documentation/it/web/manuals.itexi
# both modified: scripts/build/website_post.py
#
no changes added to commit (use "git add" and/or "git commit -a")
fede@debian:~/lilypond-translation$ git add .
fede@debian:~/lilypond-translation$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: Documentation/it/web/community.itexi
# modified: Documentation/it/web/download.itexi
# modified: Documentation/it/web/manuals.itexi
# modified: scripts/build/website_post.py
#
fede@debian:~/lilypond-translation$ git rebase --continue
Applying: Web-it: add italian translation
Applying: Web-it: fixed some errors about node names
fede@debian:~/lilypond-translation$ git status
# On branch lilypond/translation
# Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
#
nothing to commit (working directory clean)