Sounds like there's general support for some branch renames. I may not get a chance to do that today, but it will happen soon.
Great Job, Urist!!!
Thank you, and welcome back! I'm hoping to still grab your new leather values at some point.
Although, I wonder if the "experimental" branch should exist, as it may be too easy for issues in there to be misdirected to the wrong test project. At least that's just my opinion and maybe GIT makes it easier to do so.
It's not something I'd recommend everyone use, but I'm going be maintaining the branch locally because it means that: (a) I can make sure everything merges cleanly, and (b) I can teach my tools how to merge things so I don't have to. (It's an advanced topic, but `git rerere` is awesome.) I won't make the download link obvious, so I don't think people will end up with it by accident.
Please add to .gitignore:
Dwarf Fortress\data\init\d_init.txt
Dwarf Fortress\data\init\init.txt
Dwarf Fortress\data\init\interface.txt
Dwarf Fortress\data\init\world_gen.txt
Dwarf Fortress\data\init\embark_profiles.txt
Dwarf Fortress\data\init\macros\*.mak
Alas, I can't do that. Without these files in the repository, the resulting checkout simply wouldn't be playable. However if you use your own custom files (and I do), the easiest thing to do is to have your own local branch:
$ git checkout master # Or unified, or wherever you wish to branch from.
$ git checkout --track -b play # Here's our local branch we wish to play on.
# Edit/move/whatever your customisations. I usually run the Settings
# GUI at this point, adjust worldgen params, etc.
$ git add -A . # Mark all our changes for inclusion.
$ git commit # Commit your local customisations.
You then have a master branch which is identical to your master branch on github, which can be used for development. You also have a 'play' branch that has your customisations, and which is tracking your local master branch. The play branch is local; it won't get uploaded to github, and exists only on your machine.
You can `git pull` on your play branch to merge from your master branch. If there are conflicts, you can always use `git checkout -- data/init` to choose to use your existing files, and then `git commit` to mark the changes as resolved. This gives you a chance to review conflicts first.
Alternatively, `git pull -s ours` on the play branch will tell git to
automatically favour our revisions when conflicts exist, and it's pretty darn awesome. You
might be able to use `git config branch.play.mergeoptions -sours` to do this automatically for the play branch, but I haven't actually tested that. If that works, then it pretty much solves all our play-config options.
~ T
Author
Topic: «*MASTERWORK-DF - Studded With Patches*» - Unofficial release (Read 73286 times)