Select Git revision
-
Edric Tang authoredEdric Tang authored
README.md 184 B
Git Laboratory
This is a feature branch. <<<<<<< HEAD This will also cause a conflict.
This will cause a conflict.
conflict-branch Staged change Remote branch change