Rebasing a PR

If you have been asked to rebase a PR, please follow these steps:

1. Checkout and update the gh-pages branch

git checkout gh-pages
git pull https://github.com/swcarpentry/python-novice-inflammation

2. Rebase the branch you used to create your Pull Request

git rebase gh-pages your-branch

3. (Optional) Resolve encountered conflicts If you encounter conflicts, resolve them and continue the rebase:

# resolve conflicts
git add file-with-resolved-conflict.ext
git rebase --continue

If conflicts seem to be too difficult, abort the rebase and ask maintainers to rebase the branch for you. To abort the rebase:

git rebase --abort

3. Push your changes to your fork

git push --force your-fork