Ramkumar Ramachandra [off-list ref] writes:
This is a replacement for rr/fmt-merge-msg. It corrects the problems
pointed out by Jonathan and adds one extra patch. Additionally, I've
rebased it so there's no merge conflict when you merge it into `pu`
(see: jn/merge-renormalize). 4/5 from v5 has been dropped.
Thanks,
Just as a future reference, in a case like this that results in trivial
conflict, I'd prefer to see a patch that can be used independently from
other unrelated branches.
Maybe you'd want a new test or two in t6200?
Hi Junio,
Junio C Hamano writes:
Ramkumar Ramachandra [off-list ref] writes:
quoted
This is a replacement for rr/fmt-merge-msg. It corrects the problems
pointed out by Jonathan and adds one extra patch. Additionally, I've
rebased it so there's no merge conflict when you merge it into `pu`
(see: jn/merge-renormalize). 4/5 from v5 has been dropped.
Thanks,
Just as a future reference, in a case like this that results in trivial
conflict, I'd prefer to see a patch that can be used independently from
other unrelated branches.
Oh, okay. I think I realize why- if the dependent topics are ejected,
you'll have more trouble taking this forward to `next` and `master`,
right?
Maybe you'd want a new test or two in t6200?
Good idea! It'll give me the chance to familiarize myself with
test-lib.sh :)
-- Ram