Changes between Version 7 and Version 8 of Policy/GitMaster


Ignore:
Timestamp:
06/30/15 08:59:16 (3 years ago)
Author:
nckmccnnll
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Policy/GitMaster

    v7 v8  
    33== Setting up == 
    44 
    5 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.  
     5Assuming 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.  
    66 
    77Make a local copy of the official/master branch (we'll call it master2, because your local "master" branch is tracking your origin/master): 
     
    4646If 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. 
    4747 
     48== Bugfixes == 
     49 
     50To fix a bug in the current release (currently 4.0.x) 
     511. Branch from official/4.0-release 
     522. Fix the bug on your new branch 
     533. Rebase onto 4.0-release (it may not have moved, which makes it easy) 
     544. Merge back into 4.0-release 
     55 
    4856N.B. When responding to a pull request, please check that the changes adhere to the CodingGuidelines before committing to master.