Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
12 check-ins related to "better-merge"
|
2024-12-05
| ||
| 20:12 | When doing a merge, if a merge conflict occurs, a new section appears in the merge conflict markings that shows the suggested resolution. In addition, the "merge-info --tk" GUI is improved so that line numbers in the result column correspond with line numbers in the actual file. ... (check-in: 1cf0d372fa user: drh tags: trunk) | |
| 20:08 | Improvements to the file selection option-menu in the merge UI. ... (Closed-Leaf check-in: 4582d69e34 user: drh tags: better-merge) | |
| 19:22 | Improvements to the merge UI. Fix a mostly-harmless assertion associated with merge marks. ... (check-in: 48827897cf user: drh tags: better-merge) | |
| 18:56 | Fix horizontal scrolling in the merge UI. ... (check-in: 06df966b19 user: drh tags: better-merge) | |
| 18:45 | Merge UI menu buttons working on Darwin. ... (check-in: 76b39a2c9f user: drh tags: better-merge) | |
| 18:00 | Improvements to how resizing works in the merge --tk UI. ... (check-in: e9d1d71669 user: drh tags: better-merge) | |
| 17:13 | In the merge engine, make sure V1 is always used for the local copy and V2 is used for the merge-in. ... (check-in: 873b364b92 user: drh tags: better-merge) | |
| 17:00 | Add a new "SUGGESTED CONFLICT RESOLUTION" section to the conflict markings. ... (check-in: adf2269602 user: drh tags: better-merge) | |
| 13:24 | Reduced memory requirements in merge_try_to_resolve_conflict(). ... (check-in: 1651561630 user: drh tags: better-merge) | |
| 13:16 | Bug fixes sufficient to get the automated merge conflict resolution working. ... (check-in: 1174e5f2fd user: drh tags: better-merge) | |
| 12:15 | Steps toward doing a better job of automatically resolving merge conflicts. Compiles but does not work. This is an incremental check-in. ... (check-in: 849c7eb6ca user: drh tags: better-merge) | |
|
2024-12-04
| ||
| 19:25 | Fix rendering of merge information that contains "N" entries followed by "S". ... (check-in: 2ec8a7ae38 user: drh tags: trunk) | |