Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
4 check-ins using file www/changes.wiki version d721b9ba2b
|
2020-02-26
| ||
| 15:23 | Implement the --keep-merge-files option for the merge and update commands. Merge-conflict files are omitted without this option. The merge conflict files continue to exist for the stash command. ... (check-in: d20ead10c3 user: drh tags: trunk) | |
| 14:07 | The stash now uses the legacy behaviour for merge conflicts, always keeping the baseline/original/merge files, because there's otherwise a potential for undo suffering when stash pop has a conflict. (Thanks to Florian for pointing that out.) ... (Closed-Leaf check-in: 31dc956dfa user: stephan tags: merge-remove-temp-files) | |
|
2020-02-25
| ||
| 23:03 | This merge occurred on a laptop and didn't get synced. Before the missing sync was discovered, other check-ins occurred both on the branch and on trunk. So it seems best to just abandon this merge. ... (Closed-Leaf check-in: 6f08a5937b user: drh tags: mistake) | |
| 20:57 | Implemented merge/update --keep-merge-files, per discussion at [https://fossil-scm.org/forum/forumpost/1407a2d73e|/forumpost/1407a2d73e]. ... (check-in: 1bfd760de4 user: stephan tags: merge-remove-temp-files) | |