[PATCH 00/12] Towards a better merge resolution support · Junio C Hamano <hidden> · 2016-06-15
[PATCH 01/12] xdl_fill_merge_buffer(): separate out a too deeply nested function · Junio C Hamano <hidden> · 2016-06-15
[PATCH 02/12] xdiff-merge: optionally show conflicts in "diff3 -m" style · Junio C Hamano <hidden> · 2016-06-15
[PATCH 03/12] xmerge.c: minimum readability fixups · Junio C Hamano <hidden> · 2016-06-15
[PATCH 04/12] xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less · Junio C Hamano <hidden> · 2016-06-15
[PATCH 05/12] rerere.c: use symbolic constants to keep track of parsing states · Junio C Hamano <hidden> · 2016-06-15
[PATCH 06/12] rerere: understand "diff3 -m" style conflicts with the original · Junio C Hamano <hidden> · 2016-06-15
[PATCH 07/12] merge.conflictstyle: choose between "merge" and "diff3 -m" styles · Junio C Hamano <hidden> · 2016-06-15
[PATCH 08/12] git-merge-recursive: learn to honor merge.conflictstyle · Junio C Hamano <hidden> · 2016-06-15
[PATCH 09/12] checkout: do not check out unmerged higher stages randomly · Junio C Hamano <hidden> · 2016-06-15
[PATCH 10/12] checkout: allow ignoring unmerged paths when checking out of the index · Junio C Hamano <hidden> · 2016-06-15
[PATCH 11/12] checkout --ours/--theirs · Junio C Hamano <hidden> · 2016-06-15
[PATCH 12/12] checkout -m: recreate merge when checking out of unmerged index · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 07/12] merge.conflictstyle: choose between "merge" and "diff3 -m" styles · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 04/12] xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 03/12] xmerge.c: minimum readability fixups · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 02/12] xdiff-merge: optionally show conflicts in "diff3 -m" style · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 01/12] xdl_fill_merge_buffer(): separate out a too deeply nested function · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 00/12] Towards a better merge resolution support · Alex Riesen <hidden> · 2016-06-15
Re: [PATCH 00/12] Towards a better merge resolution support · Alex Riesen <hidden> · 2016-06-15
Re: [PATCH 00/12] Towards a better merge resolution support · Abhijit Menon-Sen <hidden> · 2016-06-15
Re: [PATCH 00/12] Towards a better merge resolution support · Thomas Rast <hidden> · 2016-06-15

Re: [PATCH 00/12] Towards a better merge resolution support

From: Abhijit Menon-Sen <hidden>
Date: 2016-06-15 22:45:16

At 2008-09-01 11:44:12 +0200, raa.lkml@gmail.com wrote:

IOW, copy the commit resolution from some other merge commit. Maybe
can be a way to use rerere mechanism with that?

That's what I'm trying to implement on Dscho's suggestion. I'm still
just trying to understand the code, so any suggestions about how to
do this are very welcome.

-- ams

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help