![github desktop forked repository github desktop forked repository](https://dl.flathub.org/repo/screenshots/io.github.shiftey.Desktop-stable/1504x846/io.github.shiftey.Desktop-f95c55694c1fe8e6c474d34b66706af2.png)
You can auto-complete code, look up docs or the source code of function definitions, even in JAR files, without leaving the context of the commit dialog. It also has a magic-wand icon, which seems to resolve 95% of conflicts automatically and correctly, presumably doing something based on common ancestor commits.īUT what makes both this 3-way merge interface AND the commit interface really great, is the ability to edit in-place, with all your custom keybindings, syntax highlighting, linting and code intelligence tools! The sticking point for me is how well it deals with the 3-way resolution of merge conflicts. The JetBrains IDEs are cross-platform, including Linux and cross architecture, including ARM, because the JVM/JDK is cross-arch. IntelliJ Community Edition is even free and open-source, so for Java coding it's perfect, but pretty good for Clojure, Python, PHP too. This feedback is private to you and won’t be shared publicly.My choice is the VCS client in JetBrains IDEs, like IntelliJ, WebStorm, P圜harm etc. Mark contributions as unhelpful if you find them irrelevant or not valuable to the article. For instance does a tool offer to show blame info or does a tool offer integration of side by side views. What I saw, is that there are some detailed feature that could decide. If now someone is just interested in using a Git tool to compare history, it is is really a matter of personal taste. With having all three features, my first choice is Fork. I have a working directory where I have repos and so far the only tools that seem to provide that is Tower and Fork. I love the idea of a Repository Manager, because this is what I am looking for. But still for my very personal way of working, there was one tool that stood out a bit: Fork. My personal recommendation: ForkĪs written above, different ways of of working, different recommendations. People seem to like GitKraken for its DarkTheme (really is that so important). Looking then on stackshare.io, we do not get much more material for a clear recommendation. If I had to choose a favourite, it is this one. Fork is again a tool which is good for handling many repositories and also provides a good intuitive way to explore the past and the current uncommitted changes.Finally Sublime Merge, Sourcetree and Github are neat, but very much focussed on single repository handling.SmartGit seemed to be a bit too rigid in the UI handling, but delivers good overviews and comparisons.Tower is the tool for managing many local repos as you can import all and group them, but if it is them exploring the history, for me at least it seems that other tools were a bit nicer.One tool (GitUp) shines with visualization - It displays the history better than any other tool, but the rest is basic.We have one tool(Gitkraken) that tries to be a bit more different and tries to integrate some more own features.It is difficult to recommend a best tool. I announced proudly that I would recommend a tool instead of just listing them up and say the usual it depends. But then again, the same thing to others. It does a solid job in exploring the past and changes. GitUp is a tool that shines with this visualization. In 2005, I dropped out of my ClearCase project and in all subsequent projects I did - no matter if it was Subversion, TeamFoundation Server or Git, I was missing the ClearCaseExplorer. I had some experience with other tools as well, such as Visual SourceSafe, but ClearCase was the tool I was using for two years and I loved it. Exploring History: Who did what in the past?.Git Commands: Applying commits, pushes and other common commands on a repo.Repository Management: The ability of a tool to manage multiple repos.While I was exploring the tools, I also realized that I should group into two features: I did a bit of Googling and looked which tools come up often. Therefore, I decided to look for a tool that manages my repositories. It does not help much to delete local repositories regularly. So, all in all, it creates a bit of an effort to keep an overview of what is on my machine.
![github desktop forked repository github desktop forked repository](https://i.stack.imgur.com/ztqaV.jpg)
If I work within a guest VMs, I normally mount this workspace directory. Labs are highly personal, but still I keep most of them in repos. So, for instance when I started to work with Jenkins X, I create a repo there.
![github desktop forked repository github desktop forked repository](https://www.freecodecamp.org/news/content/images/2019/11/explanation.png)
But even if I group my projects with tags and naming conventions, sometimes on my hosts it gets messy.