From c41e5ff8dda7a0387a03de6a487d30eb66d5d080 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 1 Jan 2019 16:04:18 -0500 Subject: [PATCH] Updated Contributing to Jellyfin (markdown) --- Contributing-to-Jellyfin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contributing-to-Jellyfin.md b/Contributing-to-Jellyfin.md index c20d9de..8e153d0 100644 --- a/Contributing-to-Jellyfin.md +++ b/Contributing-to-Jellyfin.md @@ -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/``` -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.