white_noise wrote:Where can I read more about it? Like some manual for dummies?
Start with crawl's
INSTALL.txt. You need to be able to download the sources and compile. Next, check
docs/develop/git/quickstart.txt for some basic git setup. You can also check the official
git documentation, but it's pretty scary. And you only need to know a few commands. Just use it to learn more about the commands I mention below if you have any problem with them. Create you branch with git checkout -b my_tiles (or whichever branch name of your choice). Then, here is the workflow:
Add your tiles to the source. Edit the rltiles/dc-foo.txt files and possibly some source files (read
tiles_creation.txt if you haven't already). Next, type git commit -a to commit your changes. Use "git add" first if you have added new files. If you want to submit them, type git format-patch -1. It will make a patch file extremely easy for us to commit.
To keep your branch up-to-date, type:
- Code:
git fetch origin master:master
git rebase master
The first command allows you to pull the latest changes to master without having to leave your branch. Basically, it's a shortcut to "git checkout master; git pull; git checkout my_tiles". The second command rebase your branch on top of trunk. It's a bit complicated to explain, but it has the advantage of keeping your changes on the top of the branch. If you have issues with it, use "git merge master" instead which might be a bit easier.