nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-19 08:03:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updating contrib docs with steps on using git.

Browse Source
This commit is contained in:
laf
2014-03-09 21:53:41 +00:00
parent 6c64e98bdf
commit 70dce5cf0f
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/CONTRIBUTING.md
+20 -4
View File
@@ -74,19 +74,35 @@ conflicts in master.
Workflow: Workflow:
- Ensure you have aut rebranching switched on in your gitconfig.
```
[branch]
autosetuprebase = always
```
- Fork the [LibreNMS repo master branch][2] in your own GitHub account. - Fork the [LibreNMS repo master branch][2] in your own GitHub account.
- Create an [issue][3] explaining what work you plan to do. - Create an [issue][3] explaining what work you plan to do.
- Create a branch in your copy of the repo called issue-####, where #### is - Create a branch in your copy of the repo called issue-####, where #### is
the issue number you created. the issue number you created.
```
git push origin master:issue-####
```
- Make and test your changes in the issue branch as needed - this might take - Make and test your changes in the issue branch as needed - this might take
a few days or weeks. a few days or weeks.
- When you are happy with your issue branch's changes and ready to submit - When you are happy with your issue branch's changes and ready to submit
your patch, update your copy of the master branch to the current revision; your patch, update your copy of the master branch to the current revision;
this should just result in a fast forward of your copy of master. this should just result in a fast forward of your copy of master. Do this from your master branch:
```
git pull
```
- Rebase your issue branch from your clone of master. Fix any conflicts at - Rebase your issue branch from your clone of master. Fix any conflicts at
this stage. this stage. Do this from your issue-#### branch:
- Merge your issue branch back into of your copy of master. Again, this ````
should be a simple fast forward. git pull
````
- Push your changes to your remote git hub branch so you can submit a pull from your issue-#### branch:
````
git push origin issue-####
````
- Submit a pull request for your patch from your copy of master. - Submit a pull request for your patch from your copy of master.
[1]: http://www.gnu.org/licenses/license-list.html [1]: http://www.gnu.org/licenses/license-list.html