I can’t resolve the conflict during the merge, what could be the error?

I

Ilya2016-12-14 10:49:32

git

Ilya, 2016-12-14 10:49:32

When resolving a conflict during a merge, when we change conflicting files, it shows the error Looks like someone pushed while you were working. What could it be and how to solve it?

Reply

Answer the question

In order to leave comments, you need to log in

1 answer(s)

A

Alexander Sharihin, 2016-12-14
@Pinsky

The error message says that you need to pool first, then push your own.

Similar questions

P

Petr Volkhanov2014-01-25 15:19:56

Why does the GitList face work, but the rest of the pages Not Found? 2Reply

M

Mark2014-01-26 00:03:20

Which cloud based project management system to choose? 1Reply

I

Ivan2020-08-07 14:12:21

Is it possible somehow to completely rewrite a branch with another one from a remote repository with one command? 3Reply

V

Vadim Stepanenko2021-11-18 15:48:22

Is it possible to update the code from a branch from which another branch was created? 2Reply

G

Gyrocopter2016-04-14 03:01:46

How to backup site statics using .gitignore? 1Reply

Didn't find what you were looking for?

Ask your question