Created
April 26, 2021 17:38
-
-
Save learnit-codeit/5c1aba58068e4d40dff1cec5282d2f4a to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git status | |
On branch master | |
You have unmerged paths. | |
(fix conflicts and run "git commit") | |
(use "git merge --abort" to abort the merge) | |
Unmerged paths: | |
(use "git add <file>..." to mark resolution) | |
both modified: test.txt |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment