Show patches with: Series = Improve path collision conflict resolutions       |    State = Action Required       |    Archived = No       |   10 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v4,10/10] fixup! merge-recursive: improve rename/rename(1to2)/add[/add] handling Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New
[RFC,v4,09/10] fixup! merge-recursive: fix rename/add conflict handling Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New
[v4,08/10] merge-recursive: improve rename/rename(1to2)/add[/add] handling Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New
[v4,07/10] merge-recursive: use handle_file_collision for add/add conflicts Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New
[v4,06/10] merge-recursive: improve handling for rename/rename(2to1) conflicts Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New
[v4,05/10] merge-recursive: fix rename/add conflict handling Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New
[v4,04/10] merge-recursive: new function for better colliding conflict resolutions Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New
[v4,03/10] merge-recursive: increase marker length with depth of recursion Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New
[v4,02/10] t6036, t6042: testcases for rename collision of already conflicting files Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New
[v4,01/10] Add testcases for consistency in file collision conflict handling Improve path collision conflict resolutions - - - 0 0 0 2018-11-02 Elijah Newren New