2 Replies Latest reply on May 25, 2013 4:18 AM by Val Palhories

    Conflict Resolution using RhoStudio IDE and GitHub

    Val Palhories

      Hello,

       

      Can someone point me to a location that would show how to properly merge code when multiple people are working on the same project. I am brand new to Rho, Ruby, Git and Eclipse so it's a fairly big learning curve for me and I can't see to figure out how to merge my code from the RhoStudio IDE.

       

      Thanks

       

      -- Val