git conflict cases!
conflicted
auto resolved
Case 1: A- Doesn't exit B- Added C- Added
Case 2: A- Exists B- Deleted C- Modified
Case 3: A- Exists B- Modified C- Deleted
Case 4: A- Exists B- Modified C- Modified
ameer78/testing-conflicts
Folders and files
| Name | Name | Last commit date | ||
|---|---|---|---|---|