Git merge diff3 style need explanation

Question

I\'ve merged 2 branches and conflicts appeared, I would need some hints where it starts where it ends, etc. I\'ve replaced the code with some faked data to make it easier to

Answer 1

Here's an article about git's diff3 merge style. It points out that it's hard to tell whether lines are being added or deleted in this style.

I suggest you refine your question if you are looking for specific information. It's hard to tell what you're asking.