Need help working with git

Well, this is not directly related with CUBA, but I’m going crazy and trying to get some advice, because I’m not too good with CVS systems.

I’m going crazy with something I don’t understand what happened.

I’m merging the branch I were working with master, and checking the conflicts I see that.


In red is how were declared the function, and in red how is now, but I don’t understand why is in the same file and why it detects as the same line is there and the others are new, instead of give me the option to choose one, other or both, and WTH happened here … :tired_face:

I tried with another diff tool and this makes more sense to me, but don’t understand what happened in the other tool.