main
branch.branch_name
and open a Pull Request to the main
branch.main
branch.$ cd /path/to/your/project
$ git branch
$ git status
$ git fetch origin
origin/main
into your local branch called branch_name
.$ git merge origin/main
<<< HEAD
, ====
, and >>> main
<<< HEAD
, ====
, and >>> main
main
or your branch_name
.
<<<<<<<<<<< HEAD
this is where the conflicting code from your branch is
===========
this is where the conflicting code from the main branch is
>>>>>>>>>>> main
$ git add .
$ git commit -m "handled merge conflict from main"
branch_name
on origin.$ git push origin branch_name