On Fri, 2016-11-18 at 10:44 +0100, Matthias Brugger wrote: > Add support for the 3-way merge in git-am. > This can be done via > - the commandline > - the global option section > - the per-project section > > Signed-off-by: Matthias Brugger <[email protected]>
Funnily enough, this failed to apply :) Could you resend this once more? Stephen --- $ curl https://patchwork.ozlabs.org/patch/696524/mbox/ | git am -3 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 2341 0 2341 0 0 1547 0 --:--:-- 0:00:01 --:--:- - 1548 Applying: pwclient: support 3-way merge fatal: patch fragment without header at line 6: @@ -657,6 +663,10 @@ def main(): error: could not build fake ancestor Patch failed at 0001 pwclient: support 3-way merge The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". _______________________________________________ Patchwork mailing list [email protected] https://lists.ozlabs.org/listinfo/patchwork
