Permalink
Browse files

Change CONTRIBUTING.md

Replace 'master' with 'development' branch because
the former branch isn't up to date.
  • Loading branch information...
Atvaark authored and mrexodia committed Oct 12, 2018
1 parent be8dfae commit 7d1b0f6f90c11b9c591b24cd7f5ab0d8c328e1ec
Showing with 1 addition and 1 deletion.
  1. +1 −1 CONTRIBUTING.md
@@ -44,7 +44,7 @@ Here is a little guide on how to do a clean pull request for people who don't ye
5. Commit your change. `git commit -m 'a message about what you changed'`. The change are applied to your local git repo.
6. Push it to your `origin`. The `origin` is your repo which is hosted on github. `git push --set-upstream origin your-branch-name`.
7. Sync with the `upstream` repo, the real x64dbg repo. `git remote add upstream https://github.com/x64dbg/x64dbg.git`, using `git remote -v` will show which origin/upstream are setup in the local repo.
8. Sync your fork with the `upstream`, `git fetch upstream`. Now checkout in the master again `git checkout master` and merge the upstream `git merge upstream/master`.
8. Sync your fork with the `upstream`, `git fetch upstream`. Now checkout your local `development` branch again `git checkout development` and merge the upstream `git merge upstream/development`.
9. Time to create the pull request! Using the github ui, go to your account/repo, select the branch you already pushed, and click `Pull request`. Review your pull request and send it.
Happy PRs!

0 comments on commit 7d1b0f6

Please sign in to comment.