Proposed solutionĪdded Use mine / theirs option for any conflicts as alternative to an actual merge. And then, they can manually merge or readd the missing items that cause the conflicts in the first place after.Ĭurrently, there is only an option to discard and it will discard all new changes without letting us to select to use the new version as the resolution for the commit.
I do this because for me that's the most productive. Then I use the gui in intellij to check in and push changes. So that people could choose which version to use for the current commit. I use command line to initiate my repositories. So to have the option to use mine versus theirs like in Sourcetree, would be helpful. But, I am working with Unity scene files and you cannot just use an editor to resolve conflicts.
SOURCETREE VS GITHUB DESKTOP SOFTWARE
However, some features are only available with paid versions, like JIRA/GitHub Entreprise/Bitbucket integration. Compare price, features, and reviews of the software side-by-side to make the best choice for your business.
The most important reason people chose SmartGit is: SmartGit can be used free of charge by Open Source developers, teachers and their students, or for hobby, non-paid usage. I read some people mention to use editor to resolve conflicts. SmartGit is ranked 1st while SourceTree is ranked 7th. In my experience using Sourcetree, when there is a conflict, you could just right click and select to resolve using my version versus their version. I mostly use Sourcetree for my projects but I have to use Github Desktop for my current project.
0 kommentar(er)
