A Git project to demo advance git operation
- make branch
Feature1
and commit - create PR
Feature1
in github - make commit to
master
- rebase the
Feature1
to master - update the
Feature1
Why Squash?
Because when rebase the feature branch to master, if you have conflict, you need to resolve it per every commit in the feature branch, so after squash you feature branch, you need only resolve conflict one time
- make branch
Feature2
and commit - create PR
Feature2
in github - make commit to master
- make some conflict between
Feature2
andmaster
- squash and rebase the
Feature2
tomaster
then resolve the conflict - update the
Feature