issues
search
HarshKapadia2
/
git_basics
A PWA and TWA for Git and GitHub concepts and commands.
https://harshkapadia2.github.io/git_basics
Creative Commons Attribution Share Alike 4.0 International
105
stars
20
forks
source link
Merge conflicts
#94
Open
HarshKapadia2
opened
2 years ago
HarshKapadia2
commented
2 years ago
[ ] Add basic merge conflict handling in the
Merge Conflicts section
.
During a merge conflict,
git status -s
gives output
UU
(both in red) for files that are conflicted.
What is the meaning?
[ ] Add it to the
-s or --short
flag
.
Resolving a Git conflict with binary files
[ ] Add
--ours
and
--theirs
to
git checkout
with a reference to
https://github.com/HarshKapadia2/git_internals
.
[ ] Write a small article on this in the
General #2 section
.
[ ] Refer to this in
https://github.com/HarshKapadia2/git_internals
.
git status -sgives outputUU(both in red) for files that are conflicted.-s or --shortflag.--oursand--theirstogit checkoutwith a reference to https://github.com/HarshKapadia2/git_internals.