memories regarding git merge/rebase