git integration

Hi,

I want to change SVN for Git.

Unfortunately have probelem with pull changes with other user.

I have user1 and user2, the have the same repo -> update from repo.

Now user1 having changes and user2 having changes.

User1 finish his job and pull changes - everithing is ok.

Now user2 finish his job too and he want to pull changes and see window to merge conflicts. There are 2 options 'ours' or 'theirs' chanages.

When he choose ours - user2 changes stay and user1 changes lost

When he choose theirs - user2 changes lost and user1 changes stay.

I want to merge changes - plugin implementation do not support this, it give you only choise bettwen stay and lose changes.

Do you have any ideas for that?

Forum Discussion