versControl2.txt

second file was made. This is a second example
$ cd
$ git clone https://github.com/MarinaWeb22/computer-graphics.git
$ cd computer-graphics
$ touch versControl2.txt
$ git add versControl2.txt
$ git commit -m "comment here"
$ git push origin main
$ git status
$ git pull origin main   (If a default branch is different than main (master: check in repo),
                          you will need to specify the branch name. If there is only one branch
                          then the branch name can be ommited.)

<<<<<<< HEAD
this change made in main on GitHub
this change made on 12.01 on GitHub
this change made on local PC
=======
branch orange
commit first
 $ git branch orange
 $ git checkout orange
 $ git add <file>
git commit -m "message"
git push origin orange

<<<<<<< HEAD
change-1 on local PC

=======
change orange on GitHub
>>>>>>> 1ea5a4ad8385fc4f9c7f876de1fbe1a440df285d

change local
>>>>>>> 8d33ac43f5c46f5d15fab8e5783edcae97ab69de