On 2009.11.02 13:26:37 +0100, Peter Krefting wrote: > # Update tree (--strategy=ours avoids merge conflicts) > git pull --rebase --strategy=ours origin master The "ours" strategy doesn't just avoid merge conflicts, it avoids making any changes at all. The ours strategy means "just keep our state, just pretend that we've merged". And rebase will see that there were no changes and conclude: Already applied: 0001 test commit And thus it will drop the commit. Björn -- 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