Code Compare.Also I find the history layout very efficient: a single window shows commits, uncommitted changes and the diff between any two commits (or your uncommitted changes and any commit).One weakness is resolving merge conflicts using "Theirs" or "Mine". SourceTree can also show the text of an annotated tag - and that is another thing that few, if any, other GIT GUIs can do.SourceTree (Multi-platform, Free) SourceTree is a free client for Git or Mercurial from the team at Atlassian and is available for Windows or Mac. And it does this in a very natural way: the current state is a node, just like each commit. SourceTree is the only GUI I have found that can show the difference between uncommitted changes and any commit. When the diff tool is not (correctly) configured, it behaves the way you described.I have tried Tower, Fork, Sublime Merge, and several others.Fortunately the contextual menu has a Copy command that does the job. The one bug I currently know about is that if one selects text from the commit info pane and types ctrl-C, it ignores the selection. It has occasional cosmetic bugs, and Atlassian can be slow to fix those. I think Fork handles that a bit better.Overall I have found it to be quite robust. But occasionally I just want to say "use my local copy" or "use the remote version" and in that situation I find it difficult to know which is which.
![]() Merg Tool For Source Tree Free Client ForThe 'native' feel of a MacOS app is certainly not there, windows look odd, navigation is clumsy and unintuitive.But worse still: the app will only help you automatically connect to accounts in Bitbucket or GitHub - no GitLab, nor any of its other competitors. Its arch-nemesis is GitLab: a service that offers unlimited, free private repositories to all - with just about every feature available in Bitbucket, and then some.But once you get through your Bitbucket registration, you will be greeted by an interface which looks very much like a java app that has received some polish. Offering a meagre 1Gb of storage, Bitbucket is among the most expensive git repository hosts around, and therefore has never enjoyed wide adoption among small developers. This will set you up with an account with Bitbucket - and getting you signed up to Bitbucket is undoubtedly the main reason for Atlassian to make this app free. If you spend a lot of time coding then it's worth trying several.In order to use the app you are required to setup an account with Atlassian. But they each have their strengths and weaknesses. Office 2016 for mac 64 bit(Oddly enough, despite all the apps competing in this space, I still find Apple FileMerge is the best one. As expected, you can configure it to use whatever external tools you want for diffing and conflict resolution. I generally review all my changes in there before doing commits it's a great way to ensure I didn't forget anything in my dev notes, and it helps me decide what the commit summary should focus on. The diff pane is quite useful. If you *only* use Git, you might want to take a look at Tower, but I use Hg at work, so I needed something that could do both.Functionally speaking, this works pretty well. Straight to the trash, and back to using Tower, until I find a reasonable substitute that won't charge me a subscription fee.SourceTree is pretty solid GUI for Mercurial & Git. I really dislike having to cycle through a big stack of large windows, especially with that awful Bookmarks window being one of them.Each of these repo windows has to be manually customized to get the sidebar/pane widths and other view settings the way you want, and to make matters worse, it doesn't even remember them reliably. There's no single-window mode that lists your repos in a sidebar (in fact, your repos are listed in yet another, ill-conceived "Bookmarks" window that you have to leave floating around if you want to see an overview, as you simply can't get any of that information anywhere else in the app). Every repo opens in its own window. It's just very poorly designed. I don't care if it's pretty that's not the issue (I actually really like the app icon everything else is…meh, but whatever). Supposedly it should do all this automatically, but for me it never has. At that point, it usually noticed which files have been modified, but it's not smart enough to recognize that I've already pulled or pushed anything until I click the sync button. For me, none of that stuff ever updates until I switch to the app and start interacting with one of the windows. This sort of stuff just drives me nuts.Lastly, there's the sync feature that's supposed to watch for file/repo changes and indicate when you've got unsaved changes, and any pending incoming/outgoing commits. For no apparent reason, the sidebar in one of the windows will have resized itself to fill 90% of the window, and everything else is completely screwed up and has to be dragged back where you wanted it, all over again. Sometimes it's just comically bad, e.g. It does get the job done, and that's the most important thing, but it manages to annoy me quite often in the process, and I would very happily pay for something better if one of the nicer apps like Tower actually supported Mercurial.In the meantime, anyone who needs to work with both Hg and Git should check this out.
0 Comments
Leave a Reply. |
AuthorPatrick ArchivesCategories |