git rebase master to branch example

Step by step example of rebasing master onto a feature branch using git commands and conflict handling for a clean linear history