How to bring the file back to normal?

S

s2018-03-25 17:24:31

git

s, 2018-03-25 17:24:31

After merging several branches with method implementations, I finally got the following file:

How to bring the file to a normal working form?

Reply

Answer the question

In order to leave comments, you need to log in

1 answer(s)

A

Alexey Yarkov, 2018-03-25
@solovladys

https://githowto.com/en/resolving_conflicts

Similar questions

R

Roman Rakzin2019-08-17 14:09:53

I

Ivan2017-03-22 18:31:02

S

strelkovandreyv2019-08-22 19:36:05

A

alex stephen2015-03-24 14:51:27

4

4ipS2015-03-25 19:42:41

Didn't find what you were looking for?