git config pull.rebase false
which means you will just take what is in master, no harm should be: git config pull.ff only # fast-forward only
fix git every time pass and git name