- Fork the main repo
- Make the fork your origin, and clone locally
- Work from the dev branch. dev is your home base
- Before you start work, update your local dev from upstream/dev
git checkout devgit fetch upstreamgit merge upstream/devgit push origin
- Branch from dev locally
- Add and commit there
- Push that branch to origin (your fork)
- Create the pull request between that branch and the main repo's dev branch
- After the PR is reviewed and approved, merge into main dev branch
- Delete your feature branch
- Repeat
Created
June 10, 2014 19:52
-
-
Save mshmsh5000/f3f7dff8186ec5d5aba1 to your computer and use it in GitHub Desktop.
DoSomething.org's almost-GitHub flow
I actually have this set up a little differently, I have the main dosomething repo as origin, I just set the push url to my fok
[remote "origin"]
url = [email protected]:DoSomething/dosomething.git
pushurl = [email protected]:angaither/dosomething.git
@angaither
Reminds GitFlow. There's also a git plugin to make it easier. Never used it though.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I always go with rebase instead of merge, esp if I am updating a branch I'm working on from dev, that way we don't get tons of "Merge branch" commits in our pull requests: https://github.com/DoSomething/dosomething/wiki/Contributing#using-git-rebase-to-keep-up-to-date