Show patches with: Series = Improve path collision conflict resolutions       |    State = Action Required       |   8 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v3,8/8] merge-recursive: improve rename/rename(1to2)/add[/add] handling Improve path collision conflict resolutions - - - --- 2018-10-19 Elijah Newren New
[v3,7/8] merge-recursive: use handle_file_collision for add/add conflicts Improve path collision conflict resolutions - - - --- 2018-10-19 Elijah Newren New
[v3,6/8] merge-recursive: improve handling for rename/rename(2to1) conflicts Improve path collision conflict resolutions - - - --- 2018-10-19 Elijah Newren New
[v3,5/8] merge-recursive: fix rename/add conflict handling Improve path collision conflict resolutions - - - --- 2018-10-19 Elijah Newren New
[v3,4/8] merge-recursive: new function for better colliding conflict resolutions Improve path collision conflict resolutions - - - --- 2018-10-19 Elijah Newren New
[v3,3/8] merge-recursive: increase marker length with depth of recursion Improve path collision conflict resolutions - - - --- 2018-10-19 Elijah Newren New
[v3,2/8] t6036, t6042: testcases for rename collision of already conflicting files Improve path collision conflict resolutions - - - --- 2018-10-19 Elijah Newren New
[v3,1/8] Add testcases for consistency in file collision conflict handling Improve path collision conflict resolutions - - - --- 2018-10-19 Elijah Newren New