Skip to content
Snippets Groups Projects

Remote branch

Merged Remote branch
remote-branch into master
Merged Bryant Lin requested to merge remote-branch into master
Compare
and
1 file
+ 4
− 0
Compare changes
  • Side-by-side
  • Inline
README.md
+ 4
− 0
@@ -5,3 +5,7 @@ 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