On 23 March 2010 16:05, Scott Chacon <schacon@xxxxxxxxx> wrote: > Why would we teach someone to do that instead of just recommending the > far less obscure 'git push -f'? A leading '+' on the refspec is > ridiculously confusing compared to "just tell it to force the push > with -f". Am I forgetting something? > > Also, Howard, what do you mean by "I forgot to merge"? Do other > people have push access to this branch? You can't just tell people > "use the local version" after you force a push. If anyone has based > work off of that point, you're going to get into way more trouble > forcing a non-ff push than if you just did a merge and then resolved > all the conflicts as --ours. I'm not really fussed. I hope not to make a habit of this. I'll probably forget and ask again next time :) It's not a repo that particularly matters - just a convenience thing for some test scripts. If it had been on a proper production repo then I would just have dealt with the conflicts. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html