C:\OpenServer\domains\lmlab2.local>git merge conflict-start
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
C:\OpenServer\domains\lmlab2.local>git merge --abort
C:\OpenServer\domains\lmlab2.local>git add .
C:\OpenServer\domains\lmlab2.local>git commit -m "Добавил небольшой плагин, для отслеживания загрузки изображения как из кеша так и в 1й раз"
On branch develop
Your branch and 'origin/develop' have diverged,
and have 3 and 20 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean
C:\OpenServer\domains\lmlab2.local>git pull
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 5), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From ssh://gitlab.convergentcmg.com:22902/pmi/lmlab2
d112bd7..4b54b60 develop -> origin/develop
Removing frontend/src/user/images/settings/st1_logo_white.svg
CONFLICT (modify/delete): frontend/src/landing/main.js deleted in HEAD and modified in 4b54b605d97cc33336191577b2f2f7027735787b. Version 4b54b605d97cc33336191577b2f2f7027735787b of frontend/src/landing/main.js left in tree.
Removing frontend/src/common/images/logo_white.png
Removing frontend/src/common/images/logo_blue.png
Automatic merge failed; fix conflicts and then commit the result.
C:\OpenServer\domains\lmlab2.local>git push
To ssh://gitlab.convergentcmg.com:22902/pmi/lmlab2.git
! [rejected] develop -> develop (non-fast-forward)
error: failed to push some refs to 'ssh://git@gitlab.convergentcmg.com:22902/pmi/lmlab2.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.