First of all, thank you for wanting to contribute to Nancy! We really apprechiate all the awesome support are get from our community. We want to keep it as easy as possible to contribute changes that get things working in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
- Fork on GitHub
- Make sure your line-endings are configured correctly
- Clone your fork locally
- Configure the upstream repo (
git remote add upstream git://github.com/NancyFx/Nancy)
- Create a local branch (
git checkout -b myBranch)
- Work on your feature
- Rebase if required (see below)
- Push the branch up to GitHub (
git push origin myBranch)
- Send a Pull Request on GitHub
You should never work on a clone of master, and you should never send a pull request from master - always from a branch. The reasons for this are detailed below.
While you're working away in your branch it's quite possible that your upstream master (most likely the canonical NancyFx version) may be updated. If this happens you should:
- Stash any un-committed changes you need to
git checkout master
git pull upstream master
git checkout myBranch
git rebase master myBranch
git push origin master- (optional) this this makes sure your remote master is up to date
This ensures that your history is "clean" i.e. you have one branch off from master followed by your changes in a straight line. Failing to do this ends up with several "messy" merges in your history, which we don't want. This is the reason why you should always work in a branch and you should never be working in, or sending pull requests from, master.
If you're working on a long running feature then you may want to do this quite often, rather than run the risk of potential merge issues further down the line.
While working on your feature you may well create several branches, which is fine, but before you send a pull request you should ensure that you have rebased back to a single "Feature branch" - we care about your commits, and we care about your feature branch; but we don't care about how many or which branches you created while you were working on it :-)
When you're ready to go you should confirm that you are up to date and rebased with upstream/master (see "Handling Updates from Upstream/Master" above), and then:
git push origin myBranch
- Send a descriptive Pull Request on GitHub - making sure you have selected the correct branch in the GitHub UI!
- Wait for TheCodeJunkie to merge your changes in and reformat all of your code because he has StyleCop OCD ;-)