From af9c4561bd42473f25f6b0ad15cb6eb263384b91 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Thu, 3 Jan 2019 15:42:11 -0500 Subject: [PATCH] Updated Contributing to Jellyfin (markdown) --- Contributing-to-Jellyfin.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributing-to-Jellyfin.md b/Contributing-to-Jellyfin.md index 5e37fc6..537e7ae 100644 --- a/Contributing-to-Jellyfin.md +++ b/Contributing-to-Jellyfin.md @@ -47,6 +47,7 @@ Jellyfin uses a "feature branch" model, though usually a feature branch is local 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. +1. Once the PR is merged, ensure you keep your local and fork branches up-to-date: ```git fetch --all && git checkout dev && git rebase upstream/dev && git push -u origin dev``` ### CONTRIBUTORS.md