Updated Contributing to Jellyfin (markdown)

Joshua M. Boniface 2019-01-01 16:04:18 -05:00
parent 8c32ab7e1d
commit c41e5ff8dd

@ -60,7 +60,7 @@ You should now be ready to begin building or modifying the project.
Jellyfin uses a "feature branch" model, though usually a feature branch is local to each developer and is integrated in one shot, though in the future project-wide feature branches may become common. This section assumes a local feature branch.
1. Rebase your local branches against upstream `master`/`dev`: ```git fetch --all && git rebase upstream/<BRANCH>```
1. Create a local feature branch off of `dev`: ```git checkout dev && git checkout -b my-feature```
1. Create a local feature branch off of `dev`: ```git checkout -b my-feature dev```
1. Make your changes and commits to this local feature branch, `git rebase`ing off of `dev` regularly, especially before submitting a PR.
1. Push up your local feature branch to your GitHub fork: ```git push --set-upstream origin my-feature```
1. On GitHub, create a new PR against the upstream `dev` branch.