Git status during merge conflict: Revision history

From genomewiki
Jump to navigationJump 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.

31 August 2016

  • curprev 01:1101:11, 31 August 2016Galt talk contribs 583 bytes +583 Created page with " Running git status during a merge-conflict can often show a scarily-large number of files. These represent the work of other people in the group. If it has been several days sin..."