Pixel Pilot
A top down dogfighting game with pixel graphics. Pew Pew!
Such game, many flight, very plane, wow.
The Wright brothers are super proud.
PR Workflow
- Open feature branch
- e.g.
git checkout -b <feature-name>
- Work on feature branch (push often!)
- Squash temporary commits together
- Use
git rebase -i HEAD~n
to rebase last n
commits from HEAD
- You'll need to force push to to your feature branch:
git push --force origin <feature-name>
- Open PR on Github and do code review
- NEVER CLICK THE SHINY GREEN BUTTON!
- Make changes from code review
- Squash changes from code review into commits
- Rebase and force push!
- When ready to merge into Master, update feature branch with Master
- Update local master
git checkout master
git pull origin master
git checkout <feature-name
>
- Rebase Master onto feature branch
git rebase master
- Fix merge conflict (if needed)
git push --force origin <feature-name>
- Merge updated feature branch into Master
git checkout master
git merge <feature-branch>
git push origin master