https://tortoisegit.org/docs/tortoisegit/tgit-dug-conflicts.html

Switch Branch

> git checkout -b

Show origin of current git directory

> git remote show origin

* remote origin
Fetch URL: https://ricky_tsao@gitcn.epam.com:4443/ricky_tsao/joiner-app-backend.git
Push URL: https://ricky_tsao@gitcn.epam.com:4443/ricky_tsao/joiner-app-backend.git
HEAD branch: master
Remote branch:
master tracked
Local branch configured for ‘git pull’:
master merges with remote master
Local ref configured for ‘git push’:
master pushes to master (up to date)

Resolving Conflicts

During a merge, the working tree files are updated to reflect the result of the merge. Once in a while, you will get a conflict when you merge another branch, cherry-pick commits, rebase or apply a stash: Among the changes made to the common ancestor’s version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim. When both sides made changes to the same area, however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area. Whenever a conflict is reported you need to resolve it!

The conflicting area is marked in the file like this (also cf. the section called “HOW CONFLICTS ARE PRESENTED”):

The code from your current branch is on top, the code from the branch you are merging in is on the bottom

The contents after the first marker originate from your current working branch. After the angle brackets, Git tells us where (from which branch) the changes came from. A line with “=======” separates the two conflicting changes.