Working with GIT - HonzaCech/PA165-SportClub GitHub Wiki
Implementing New Feature
- Assign (or create & assign) github issue with the feature/bug/... to yourself
- Create new branch from
master
with titlefeature/{feature-name}
- Commit work into your feature branch
- Create pull request (if you want to continue working on the PR, prepend 'WIP: ' to the name)
- Ask colleagues for review
- Wait for approval of your PR
- Rebase branch onto master if there are new commits in master
- When rebasing onto master, fix conflicts and always run tests
- After rebase, force push the rebased branch to origin. The PR will update automatically
- Team leader merges the PR using squash & merge through github & deletes the feature branch
Rebase
git checkout <<your branch>>
git rebase master
fix conflicts, then
git rebase --continue
Force push the rebased branch
git checkout <<your branch>>
git push --force