D
D
Dima Pautov2017-04-05 15:17:19
git
Dima Pautov, 2017-04-05 15:17:19

How to fix a bullet error?

Good afternoon. I'm a complete lamer in the git, so please explain to me what's wrong? Already tired of googling.
I want to pull changes, I write: git pull
I get the following


C:\OpenServer\domains\lmlab2.local>git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please commit your changes before merging.
fatal: Exiting because of unfinished merge.

They say you need to commit changes before the merge. But how to do it?

Answer the question

In order to leave comments, you need to log in

2 answer(s)
S
Sergey Krasnodemsky, 2017-04-05
@bootd

git add .
git commit -m "my message"

V
Victor, 2017-04-05
@v_decadence

git merge --abort

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question