![]() It's not the most beautiful or most actively maintained or most powerful Git UI, but it covers everything a beginner could want to do and more and it has the option of showing you the command line commands that are run when you take an action via the UI, making it a valuable tool not only for starting to work with Git but also for getting to learn the Git command line. I encourage beginners to try out Sourcetree. ![]() I don't think an app would last very long of it was showing unreliable information. Re Git UIs being unreliable: I know people who don't like Git UIs but I haven't heard that particular complaint. For example VSCode turns Git's notes into buttons, and Sublime Text has a plugin that adds keyboard shortcuts for selecting one version or the other. Popular code editor apps have features or plugins to help that along, which I suppose could be considered conflict resolution helper tools. You can then edit the file until it looks the way it should look, save, and follow the instructions that were logged to the terminal. In addition conflict resolution is something Git does a nice job of getting the user with all on its own: if there's a conflict, an explanation is logged to the command line, and notes are added to the conflicted file explaining "this is version 1", "this is version 2". If you have a conflict, run mergetool with the command git mergetool. ![]() Git comes with mergetool, a command-line based conflict resolution tool. SmartGit has the same intuitive user interface on Windows, macOS and Linux: - graphical merge and commit history - drag and drop commit reordering, merging or. I think you can start with the conflict resolution tools Git provides for you. ![]()
0 Comments
Leave a Reply. |