/Shell/Bash/Git Automatic merge failed; fix conflicts and then commit the result

Git Automatic merge failed; fix conflicts and then commit the result

$ git status

$ git add .

$ git commit -a "Comment"

How to show code conflicts in git

$ git statusOn branch masterYou 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:   merge.txt

-1

Source: atlassian.com

Similar codes

1 vote330 views1 answer
Git add -A ignore large files
Shell/Bash
4 votes301 views3 answers
Ubuntu login as root
Shell/Bash
0 vote272 views2 answers
How export tables database in command line linux
Shell/Bash
3 votes296 views1 answer
Install docker centos 8
Shell/Bash
1 vote287 views1 answer
How to kill apache process in linux
Shell/Bash
0 vote300 views1 answer
How to install amplify cli to your react project
Shell/Bash
0 vote291 views1 answer
Git log to see changes only for a specific branch
Shell/Bash
2 votes287 views1 answer
Bash generate random number between 1 10
Shell/Bash
2 votes328 views1 answer
How to make a script run on boot linux
Shell/Bash
0 vote231 views1 answer
Bat file cd to current directory
Shell/Bash