Re: Terminology question about remote branches.
- From
- Lars Hjemli <hjemli@gmail.com>
- Date
- Aug 4, 2007, 14:35 UTC
- Message-ID
- <8c5c35580708040735l54d1b9c7i40cd80d7d11e2961@mail.gmail.com>
- In-Reply-To
- <85y7grfkbe.fsf@lola.goethe.zz>
On 8/4/07, David Kastrup <dak@gnu.org> 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