Re: Terminology question about remote branches.

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: David Kastrup <dak@...>
Cc: Lars Hjemli <hjemli@...>, Jeff King <peff@...>, <git@...>
Date: Saturday, August 4, 2007 - 10:50 am

On Sat, 4 Aug 2007, David Kastrup wrote:


Well, sort of - they are not really merge conflicts as there is no merging 
involved.  Fetching is strictly an updating process, either we update the 
branch or we don't.

When updating a remote tracking branch there are two possible scenarios:

1) the new head is a superset of the old head (i.e. the old head forms 
part of the history of the new)
2) the new head is not a superset of the old head (i.e. the old head does 
not form part of the history of the new)

The normal case is 1), and we simply update the branch to point at the 
new commit.  However what happens in case 2) depends on the configuration. 
If we have told git to force an update (indicated by the '+' on the 
beginning of the fetch line in the config) then we simply accept the new 
head as with case 1), otherwise we complain to the user and don't update 
that branch


Yes.  A remote tracking branch is basically a read-only local cache of 
something that exists in some other repository.

-- 
Julian

  ---
If you're going to do something tonight that you'll be sorry for tomorrow
morning, sleep late.
 		-- Henny Youngman
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Terminology question about remote branches., David Kastrup, (Sat Aug 4, 6:55 am)
Re: Terminology question about remote branches., Junio C Hamano, (Sun Aug 5, 3:31 am)
Re: Terminology question about remote branches., Julian Phillips, (Sun Aug 5, 10:23 am)
Re: Terminology question about remote branches., David Kastrup, (Sun Aug 5, 11:09 am)
Re: Terminology question about remote branches., Julian Phillips, (Sun Aug 5, 11:24 am)
Re: Terminology question about remote branches., Steffen Prohaska, (Sun Aug 5, 6:07 am)
Re: Terminology question about remote branches., David Kastrup, (Sat Aug 4, 10:01 am)
Re: Terminology question about remote branches., Jeff King, (Sun Aug 5, 6:05 am)
Re: Terminology question about remote branches., Steffen Prohaska, (Sun Aug 5, 6:56 am)
Re: Terminology question about remote branches., Jeff King, (Sun Aug 5, 7:02 am)
Re: Terminology question about remote branches., Jeff King, (Sun Aug 5, 6:10 am)
Re: Terminology question about remote branches., David Kastrup, (Sat Aug 4, 11:22 am)
Re: Terminology question about remote branches., Jeff King, (Sat Aug 4, 8:02 am)
Re: Terminology question about remote branches., David Kastrup, (Sat Aug 4, 8:36 am)
Re: Terminology question about remote branches., Jeff King, (Sun Aug 5, 5:21 am)
Re: Terminology question about remote branches., David Kastrup, (Sun Aug 5, 5:29 am)
Re: Terminology question about remote branches., Jeff King, (Sun Aug 5, 5:32 am)
Re: Terminology question about remote branches., David Kastrup, (Sun Aug 5, 5:44 am)
Re: Terminology question about remote branches., Jeff King, (Sun Aug 5, 5:46 am)
Re: Terminology question about remote branches., Lars Hjemli, (Sat Aug 4, 9:07 am)
Re: Terminology question about remote branches., David Kastrup, (Sat Aug 4, 1:00 pm)
Re: Terminology question about remote branches., Julian Phillips, (Sat Aug 4, 1:19 pm)
Re: Terminology question about remote branches., David Kastrup, (Sat Aug 4, 2:00 pm)
Re: Terminology question about remote branches., Theodore Tso, (Sat Aug 4, 6:56 pm)
Re: Terminology question about remote branches., David Kastrup, (Sun Aug 5, 3:06 am)
Re: Terminology question about remote branches., David Kastrup, (Sat Aug 4, 9:38 am)
Re: Terminology question about remote branches., Lars Hjemli, (Sat Aug 4, 10:03 am)
Re: Terminology question about remote branches., David Kastrup, (Sat Aug 4, 10:11 am)
Re: Terminology question about remote branches., David Kastrup, (Sat Aug 4, 10:25 am)
Re: Terminology question about remote branches., Julian Phillips, (Sat Aug 4, 10:50 am)
Re: Terminology question about remote branches., Lars Hjemli, (Sat Aug 4, 10:35 am)
Re: Terminology question about remote branches., David Kastrup, (Sat Aug 4, 11:09 am)
Re: Terminology question about remote branches., Jeff King, (Sun Aug 5, 5:24 am)
Re: Terminology question about remote branches., Lars Hjemli, (Sat Aug 4, 11:48 am)