Merge (version control): Revision history

Jump to navigation Jump to search

Diff selection: Mark the radio buttons of the revisions to compare and hit enter or the button at the bottom.
Legend: (cur) = difference with latest revision, (prev) = difference with preceding revision, m = minor edit.

27 January 2025

  • curprev 14:1714:17, 27 January 2025 imported>CirdanShipwrong m 11,676 bytes +11,676 Removed "multiple" from the opening paragraph as it is potentially misleading to suggest that the reconciliation of specifically multiple changes is a fundamental aspect of merging, when in fact it is perfectly possible to merge just *one* change.