@matheusbsbs / matheus-bagliano
Fork 0
Code Commits 81,841 Issues Pulls Cloud Agent CICD
master
bisect jch maint master next seen test todo

merge-recursive: Move handling of double rename of one file to two

Elijah Newren committed about 16 years ago

07413c5a31

merge-recursive: Avoid doubly merging rename/add conflict contents

Elijah Newren committed about 16 years ago

2a669c341a

merge-recursive: Update merge_content() call signature

Elijah Newren committed about 16 years ago

61b8bcae2d

merge-recursive: Update conflict_rename_rename_1to2() call signature

Elijah Newren committed about 16 years ago

36de17048a

merge-recursive: Structure process_df_entry() to handle more cases

Elijah Newren committed about 16 years ago

9c0bbb50f0

merge-recursive: Have process_entry() skip D/F or rename entries

Elijah Newren committed about 16 years ago

384c166807

merge-recursive: New function to assist resolving renames in-core only

Elijah Newren committed about 16 years ago

2ff739f9d2

merge-recursive: New data structures for deferring of D/F conflicts

Elijah Newren committed about 16 years ago

25c3936349

merge-recursive: Move process_entry's content merging into a function

Elijah Newren committed about 16 years ago

0c4918d1c1

merge-recursive: Move delete/modify handling into dedicated function

Elijah Newren committed about 16 years ago

5e3ce663b0

merge-recursive: Move rename/delete handling into dedicated function

Elijah Newren committed about 16 years ago

6ef2cb008f

merge-recursive: Nuke rename/directory conflict detection

Elijah Newren committed about 16 years ago

605c1bcfc4

merge-recursive: Rename conflict_rename_rename*() for clarity

Elijah Newren committed about 16 years ago

09c01f856f

merge-recursive: Small code clarification -- variable name and comments

Elijah Newren committed about 16 years ago

41d70bd6a9

t6036: Add testcase for undetected conflict

Elijah Newren committed about 16 years ago

f63622c0a9

t6036: Add a second testcase similar to the first but with content changes

Elijah Newren committed about 16 years ago

583942df09

t6036: Test index and worktree state, not just that merge fails

Elijah Newren committed about 16 years ago

c976260d0f

t6020: Add a testcase for modify/delete + directory/file conflict

Elijah Newren committed about 16 years ago

fa0ae3b1dd

t6020: Modernize style a bit

Elijah Newren committed about 16 years ago

d09c0a3935

t6022: Add tests for rename/rename combined with D/F conflicts

Elijah Newren committed about 16 years ago

707983484b
← Newer Page 2916 of 4093 Older →