/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

0 vote183 views1 answer
Install specific version of docker on ubuntu
Shell/Bash
25 votes230 views6 answers
How to install nvm in ubuntu
Shell/Bash
0 vote195 views1 answer
How iggnor .env change in github branch
Shell/Bash
1 vote206 views1 answer
How to run verilog files in linux
Shell/Bash
7 votes237 views6 answers
Where are snap files installed in ubuntu
Shell/Bash
1 vote196 views4 answers
Split big file into smaller parts
Shell/Bash
0 vote251 views1 answer
Install cairo
Shell/Bash
0 vote192 views1 answer
Install version 3.9 conda environment
Shell/Bash
1 vote187 views1 answer
Tays vimrc
Shell/Bash
0 vote245 views1 answer
Get time awake linux
Shell/Bash