Risolvere conflitti di merge in Git: 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.

17 December 2015

  • curprev 17:0517:05, 17 December 2015 Gabriele.vivinetto talk contribs 524 bytes +524 Created page with "=Mantenere la copia del branch attuale o dell'altro= * Se si vuole man mantenere la copia del file del branch '''IN''' cui si sta facendo il merge: git checkout --ours filen..."
Retrieved from "https://kb.rvmgroup.it/index.php/Risolvere_conflitti_di_merge_in_Git"