Git Rebasing - Fixing merge conflicts

gistfile1.txt

$ git checkout [default branch]

$ git pull origin [default branch] && git fetch (gets the latest changes from [default] branch and update the `.git` branches)

$ git checkout <your-working-branch>

$ git rebase origin/[default branch] (updates your current branch with latest changes from [default branch])
   - Make sure fix any conflicts

$ git add .

$ git rebase --continue 

$ git push origin <your-working-branch> -f