Forum Discussion

czyzyk29's avatar
czyzyk29
Contributor
10 years ago

git integration

Hi,   I want to change SVN for Git. Take information from https://github.com/SmartBear/ready-git-plugin/wiki Unfortunately have probelem with pull changes with other user.   I have user1 and us...
  • Shadid's avatar
    Shadid
    10 years ago

    For merging conflicting changes you need to go to your local repo directory and do it manually with git commands.

     

    We didn't add the merge support intentionally since project files are not very human readable and it will be hard to resolve such conflicts anyway.

     

    Regards,

    Shadid

czyzyk29's avatar
czyzyk29
Contributor

Ok, so it doesn't make any sence to use this plugin in composite project where you have 2 commiters.

 

So we stay with SVN

 

thx

Shadid's avatar
Shadid
Staff
10 years ago

If you have conflicting changes and you want to merge both changes then you have to do it manually regardless of tools, or whatever version control you use. Some tools will of course provide better visualization to help with the manual merge. But I don't think the number of committers has anything to do with it.

 

Regards,

Shadid