| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge: handle conflicts in recursive base building | Edward Thomson | 2015-11-25 | 24 | -0/+8 |
| | | | | | | | | | | | | | | | | | | When building a recursive merge base, allow conflicts to occur. Use the file (with conflict markers) as the common ancestor. The user has already seen and dealt with this conflict by virtue of having a criss-cross merge. If they resolved this conflict identically in both branches, then there will be no conflict in the result. This is the best case scenario. If they did not resolve the conflict identically in the two branches, then we will generate a new conflict. If the user is simply using standard conflict output then the results will be fairly sensible. But if the user is using a mergetool or using diff3 output, then the common ancestor will be a conflict file (itself with diff3 output, haha!). This is quite terrible, but it matches git's behavior. | ||||
| * | merge tests: add complex recursive example | Edward Thomson | 2015-11-25 | 11 | -6/+11 |
| | | |||||
| * | merge: add recursive test with conflicting contents | Edward Thomson | 2015-11-25 | 8 | -0/+9 |
| | | |||||
| * | merge: add recursive test with three merge bases | Edward Thomson | 2015-11-25 | 27 | -0/+19 |
| | | |||||
| * | merge: add a third-level recursive merge | Edward Thomson | 2015-11-25 | 12 | -0/+12 |
| | | |||||
| * | merge: add a second-level recursive merge | Edward Thomson | 2015-11-25 | 11 | -0/+9 |
| | | |||||
| * | merge: add simple recursive test | Edward Thomson | 2015-11-25 | 68 | -0/+121 |
| Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict. | |||||
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |