ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-11 10:46:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Put 'test' on ice for outside contributors

Browse Source
This commit is contained in:
Raymond Pasco 2015-11-16 17:56:21 -05:00
parent 88caf29d20
commit 12ad098758
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CONTRIBUTING.md
View File

@ -60,20 +60,19 @@ This is good practice for any project that uses git. You will pull
upstream branches from urbit/urbit and push to your personal urbit fork upstream branches from urbit/urbit and push to your personal urbit fork
by default. by default.
Next, check out `test`, which is the mainline development branch, and Next, check out `master`, which is the mainline development branch, and
base a new branch on it to do your work on: base a new branch on it to do your work on:
git checkout test git checkout master
git checkout -b [branch name] git checkout -b [branch name]
Now you are free to do your work on this branch. When finished, you may Now you are free to do your work on this branch. When finished, you may
want to clean up your commits: want to clean up your commits:
git rebase -i test git rebase -i master
Then you can push to your public fork with `git push` and make a pull Then you can push to your public fork with `git push` and make a pull
request via the GitHub UI. Make sure you request to merge your branch request via the GitHub UI.
into `test`, not `master`.
After your changes are merged upstream, you can delete your branch (via After your changes are merged upstream, you can delete your branch (via
github UI or `git push :[branch]` remotely, and with `git branch -d` github UI or `git push :[branch]` remotely, and with `git branch -d`