Follow-up Comment #49, patch #6104 (project freeciv):
> I have prepared patch with helptext.
It doesn't apply. It is missing stuff.
I suggest that you start using a tool to handle patch preparation. I wrote a
guide for you here.
Setup:
Get a git clone of Freeciv. The easiest way of doing so is:
git clone git://repo.or.cz/freeciv.git
To keep it simple I'll assume that you'll only work on one change to Freeciv
at once. This way I won't have to teach you about branches.
Add your changes to your git clone. An easy way to do so is to apply your
patch. A less easy way is to copy each modified file to the git tree. Make git
aware of your changes by doing:
git add path/to/changed/file
Use a commit for each patch. Create the commit for your patch by doing:
git commit -m "What the patch does"
As you work:
Make git aware of your changes by doing
git add path/to/changed/file
Add your changes to the commit
git commit --amend
Download the changes to Freeciv (assuming you used the git mirror)
git fetch
Update the Freeciv version below your patch:
git rebase origin/master
Fix a merge conflict from git rebase:
Open the file with the conflict and search for ====== to find all conflicts.
Fix it. Save the file.
git add path/to/changed/file
Do the same for any other files with a merge conflict.
git rebase --continue
Prepare a patch for the commit
git format-patch origin/master
_______________________________________________________
Reply to this item at:
<http://gna.org/patch/?6104>
_______________________________________________
Message sent via/by Gna!
http://gna.org/
_______________________________________________
Freeciv-dev mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-dev
