tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5479 from silverstripe/simplify-branch-code

Browse Source 
Simplified branching code
This commit is contained in:
Damian Mooyman 2016-05-09 17:50:22 +12:00
commit aea73cab52
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/en/05_Contributing/01_Code.md
View File

@ -47,8 +47,7 @@ We ask for this so that the ownership in the license is clear and unambiguous, a
# verify current branch 'base' then branch and switch # verify current branch 'base' then branch and switch
git status git status
git branch ###-description git checkout -b ###-description
git checkout ###-description
5. As time passes, the upstream repository accumulates new commits. Keep your working copy's branch and issue branch up to date by periodically [rebasing your development branch on the latest upstream](code#rebase-your-development-branch-on-the-latest-upstream). 5. As time passes, the upstream repository accumulates new commits. Keep your working copy's branch and issue branch up to date by periodically [rebasing your development branch on the latest upstream](code#rebase-your-development-branch-on-the-latest-upstream).