Skip to content

Instantly share code, notes, and snippets.

@ryan-lane
Last active December 7, 2015 22:52
Show Gist options
  • Save ryan-lane/4f112739a875bd4043dc to your computer and use it in GitHub Desktop.
Save ryan-lane/4f112739a875bd4043dc to your computer and use it in GitHub Desktop.
Handling SaltStack forks
# First, fork salt. This example will use https://github.com/ryan-lane/salt
git clone [email protected]:saltstack/salt.git
cd salt
git remote add myfork [email protected]:saltstack/salt.git
git checkout -b stable-2015.8
git reset --hard origin/2015.8
git push myfork stable-2015.8
# Making PRs against 2015.8
git checkout 2015.8
git pull
git checkout -b my-awesome-feature
# make changes
git commit -a
git push myfork my-awesome-feature
# Go to your repo, tell it to make a pull request.
# Make sure it's making it against saltstack's 2015.8 branch.
# Making PRs against develop
git checkout develop
git pull
git checkout -b my-awesome-feature2
# make changes
git commit -a
git push myfork my-awesome-feature2
# Go to your repo, tell it to make a pull request.
# Make sure it's making it against saltstack's develop branch.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment