On 8/4/07, David Kastrup <dak@xxxxxxx> wrote: > Can we get merge conflicts > with a remote tracking branch, too? Namely when the remote branch > messed with its history, rebased/reverted stuff? No, since the "fetch" line in .git/config is prefixed by '+', which gets translated to the '-f' option for 'git-fetch'. And this was probably the primary reason for refs/remotes/* in the first place: you have a namespace in which there is no chance for 'git-fetch' to overwrite local changes (ancient git had no such namespace). -- larsh - 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
