Git Laboratory

some changes <<<<<<< HEAD This will also cause a conflict.

This will cause a conflict.

conflict-branch Staged change Remote branch change Change from another machine Remote branch change