3 ms·Git push/pull -f Then write a little merge message and you are good to go.by wasdfff 7y agoGit push/pull -f Then write a little merge message and you are good to go.