Changes between Version 7 and Version 8 of Policy/GitMaster

Timestamp:

06/30/15 08:59:16 (5 years ago)

Author:

nckmccnnll

Comment:

--

Policy/GitMaster

@@ -3 +3 @@
 == Setting up ==
 
-Assuming your local repo has as its "origin" your own github repo, you'll need to add a new remote to track the official one: `git remote add official git@github.com:angband/angband.git` (this url assumes you are using ssh access and have configured your local ssh config accordingly). After a `git fetch official` you will then see the official/master, official/3.3-release and official/AngbandBase branches, as well as all the origin/ branches of your own github repo. 
+Assuming your local repo has as its "origin" your own github repo, you'll need to add a new remote to track the official one: `git remote add official git@github.com:angband/angband.git` (this url assumes you are using ssh access and have configured your local ssh config accordingly). After a `git fetch official` you will then see the official/master, official/3.3-release, official/3.4-release, official/3.5-release, official/4.0-release and official/AngbandBase branches, as well as all the origin/ branches of your own github repo. 
 
 Make a local copy of the official/master branch (we'll call it master2, because your local "master" branch is tracking your origin/master):
@@ -46 +46 @@
 If the official master has changed since you checked out, you are unlucky and you should do the merge again or [http://book.git-scm.com/4_rebasing.html rebase].  This way, your local master2 branch should always be strictly ahead of the official master branch.
 
+== Bugfixes ==
+
+To fix a bug in the current release (currently 4.0.x)
+1. Branch from official/4.0-release
+2. Fix the bug on your new branch
+3. Rebase onto 4.0-release (it may not have moved, which makes it easy)
+4. Merge back into 4.0-release
+
 N.B. When responding to a pull request, please check that the changes adhere to the CodingGuidelines before committing to master.