Merge Conflicts in Branches are not made visible about mergepbx HOT 5 CLOSED

Yeah, would be a cool feature, but unfortunately this would be a lot of work. Currently mergepbx reads the project file as a plist into a dictionary, then tries to merge that dictionary and then writes the result back as plist again.

So we would need some kind of datastructure that would keep the information about the conflicts and then we need a special kind of writer for the plist that can create the conflict markers. That's a lot to do and unfortunately I don't really have time for that.

But maybe we can fallback to the simple text merging mode if there is a conflict, that should be possible.

from mergepbx.

But maybe we can fallback to the simple text merging mode if there is a conflict, that should be possible.

Thats exactly what I was asking for and thought would happen! 👍🏽

from mergepbx.

Any progress here? I think this is a major issue and a blocker for usage of this awesome tool in our team!

from mergepbx.

It's implemented now, you can try the current version in master.

from mergepbx.

Thanks!

from mergepbx.