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

1 개요[ | ]

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

Console

Copy

$ git pull
CONFLICT (rename/delete): .github/workflows/release.yaml deleted in HEAD and renamed to .github/workflows/release.yml in cc7b80aa396e6453762ea13f1bd8753a0f9e52b8. Version cc7b80aa396e6453762ea13f1bd8753a0f9e52b8 of .github/workflows/release.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

Console

Copy

$ git push
To https://github.com/example/helm-charts.git
 ! [rejected]        main -> main (non-fast-forward)
error: failed to push some refs to 'https://github.com/example/helm-charts.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

2 같이 보기[ | ]