Closed
Description
git init
touch vvv.txt
git add vvv.txt;git commit -m "First checkin"
date >> vvv.txt
git add vvv.txt;git commit -m "RefOne"
git checkout HEAD^
date >> vvv.txt
git add vvv.txt;git commit -m "RefTwo"
git merge master
At this point you will have a merge conflict. "git status" will show "both modified". However, if you use libgit2sharp repo.Retrievestatus(), this file will read as Removed|Untracked
Metadata
Metadata
Assignees
Labels
No labels