Working with GIT - HonzaCech/PA165-SportClub GitHub Wiki

Implementing New Feature

  1. Assign (or create & assign) github issue with the feature/bug/... to yourself
  2. Create new branch from master with title feature/{feature-name}
  3. Commit work into your feature branch
  4. Create pull request (if you want to continue working on the PR, prepend 'WIP: ' to the name)
  5. Ask colleagues for review
  6. Wait for approval of your PR
  7. Rebase branch onto master if there are new commits in master
  8. When rebasing onto master, fix conflicts and always run tests
  9. After rebase, force push the rebased branch to origin. The PR will update automatically
  10. 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