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