Open main menu

CDOT Wiki β

Changes

DPS909 & OSD600 Fall 2018

118 bytes added, 15:53, 3 October 2018
Week 5
*** <code>git merge --continue</code>
*** <code>git branch -d</code>
** Merge Conflicts
*** Conflict markers <code><<<<<<<<<</code>, <code>=============</code>, <code>>>>>>>>>>>>></code>
** [https://blog.humphd.org/fearless-merges/ Doing big merges in git]