Git Commands From Begin To End - 221210 - 021009
Git Commands From Begin To End - 221210 - 021009
Merging conflicts:
1. git switch -c <branch name>
(creating new branch and
switching to it atthe same time)
2. git commit -a -m "updated code
comment "
3. git switch <main branch>
<<making changes in same place
in main branch>>
4. git commit -a -m "updated main
branch code comment "
<<trying to merge from previous
branch using git merge -m
"comment for merging" <branch
name that merging is going to
happen from> >>
<<error message appears>>
<<in the code file 2 text of codes
are presented and you get to
choose only one of them>>
<<you delete one of the code
paragraph>>
5. git commit -a -m "update the
change to main branch code"