Re: Guided merge with override

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

To: Johannes Sixt <j.sixt@...>

Cc: Geoff Russell <geoffrey.russell@...>, <git@...>

Date: Monday, June 16, 2008 - 5:16 pm

On Mon, Jun 16, 2008 at 12:16:12PM +0200, Johannes Sixt <j.sixt@viscovery.net> wrote:
quoted text> I don't think that's what Geoff needs. The 'theirs' strategy replaces the
> entire tree by 'their' - B's - tree. But IIUC, only the subset of files
> that are contained in B should be replaced by B's version, the rest of the
> files should remain unchanged. This is quite different from 'theirs' strategy.

Thanks, I missed that difference, and sorry for the wrong suggestion.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

Guided merge with override, Geoff Russell, (Mon Jun 16, 12:16 am)

Re: Guided merge with override, Miklos Vajna, (Mon Jun 16, 5:25 am)

Re: Guided merge with override, Johannes Sixt, (Mon Jun 16, 6:16 am)

Re: Guided merge with override, Sverre Rabbelier, (Mon Jun 16, 6:21 pm)

Re: Guided merge with override, Johannes Sixt, (Tue Jun 17, 2:16 am)

Re: Guided merge with override, Sverre Rabbelier, (Tue Jun 17, 4:53 am)

Re: Guided merge with override, Johannes Schindelin, (Tue Jun 17, 5:48 am)

Re: Guided merge with override, Sverre Rabbelier, (Tue Jun 17, 5:53 am)

Re: Guided merge with override, Johannes Schindelin, (Tue Jun 17, 6:17 am)

Re: Guided merge with override, Geoff Russell, (Mon Jun 16, 6:45 pm)

Re: Guided merge with override, Junio C Hamano, (Tue Jun 17, 4:04 pm)

Re: Guided merge with override, Johannes Schindelin, (Wed Jun 18, 11:19 am)

Re: Guided merge with override, Johannes Schindelin, (Wed Jun 18, 11:28 am)

Re: Guided merge with override, Junio C Hamano, (Wed Jun 18, 12:31 pm)

[PATCH 1/2] git-merge-file --ours, --theirs, Junio C Hamano, (Fri Jun 20, 3:38 am)

[PATCH 2/2] git-merge-recursive-{ours,theirs}, Junio C Hamano, (Fri Jun 20, 3:48 am)

Re: [PATCH 2/2] git-merge-recursive-{ours,theirs}, Johannes Schindelin, (Fri Jun 20, 8:58 am)

Re: Guided merge with override, Johannes Schindelin, (Wed Jun 18, 3:29 pm)

Re: Guided merge with override, Miklos Vajna, (Mon Jun 16, 5:16 pm)


linux-kernel:
Zach Brown	[PATCH 3 of 4] Teach paths to wake a specific void * target instead of a whole tas...
Paul Jackson	Re: cpuset-remove-sched-domain-hooks-from-cpusets
Jeff Garzik	Re: Linux 2.6.23-rc9 and a heads-up for the 2.6.24 series..
Greg Kroah-Hartman	[PATCH 002/196] Chinese: rephrase English introduction in HOWTO
linux-netdev:
Eric Dumazet	Re: [PATCH] tcp: splice as many packets as possible at once
Jarek Poplawski	[PATCH] pkt_sched: Destroy gen estimators under rtnl_lock().
Ingo Molnar	Re: [GIT]: Networking
Alexey Dobriyan	[PATCH 06/53] netns xfrm: per-netns xfrm_state_bysrc hash
git:

openbsd-misc:

Re: Guided merge with override

Online users