(Sourcetree only bolds the branch name, which is hard to see with lots of branches)Įasily inspect the state of any file as of a certain commit ( Right-Click on a commit > View Tree). The checked-out branch name is prominent at the top of the window: Trying to open a repo you've opened before is painful.) (Sourcetree gets slower the more repo tabs that are open. Sublime Merge remembers the last dozen or so repos you opened. Instantly switch to another repo using Shift+ Ctrl+ O. (Sourcetree opens repos as tabs inside a single window, so you can't do a side-by-side of two repos) Its possible to open multiple windows if that's what you need. The full path to the repo is shown in the Window title. Labels are poorly written too, which makes it scary for learners) (Sourcetree hides most of the git internals, so you need to experiment. Tool tips on some buttons show what git commands will be executed when you press them (this helps you learn git). (The workflow in Sourcetree is vague and unintuitive) The work flow for resolving merge conflicts is very streamlined: (In Sourcetree there are many clicks and confusing options, and its so slow performing the clone) The rebase commands to abort or continue are hidden 2 deep in a menu.)Ĭloning a repo is wonderfully simple - you can do it in two clicks: (Sourcetree doesn't have clear indicators that a rebase is in progress. You can refer to the last git command, and there are buttons to Abort rebase or Continue rebase. The GUI has clear indicators to show when you are currently rebasing. (The Interactive rebase interface in Sourcetree is vague and unintuitive) Simply select one or more commits, then use the context menu to squash, reorder, drop, amend commit message, etc. Interactive rebase commands are performed individually, and this works out to be very intuitive from a GUI. (Sourcetree can do this, but its unreliable and usually doesn't give the correct result) The entire interface is consistent and elegant.Ĭtrl+ Click any two commits to see a diff of them. Please also head over to their website and read the feature highlights. Sublime Merge is a great tool and its features helped me learn git and made my workflow faster.īelow I've explained each awesome feature, followed by a comparison with SourceTree. After switching to Sublime Merge my knowledge of git exploded and it has been a great discovery process. I have used Sourcetree for over a year and during that time I was still learning git. Sometimes when you click on a branch it doesn't jump to it in the graph view. Regularly prompts for authentication for each repo separately (very frustrating). Regularly complains about corrupt dictionaries and asks if I want to delete them. Regularly crashes and needs to be reinstalled (or requires a reboot), usually just after updating Microsoft Office. Note: my experience is with the Windows versions of Sublime Merge and Sourcetree. I hope my comments help to further improve both tools. The main point of this article is to point out the amazing features in Sublime Merge, and to illustrate why you should avoid using Sourcetree. When you'll start Sourcetree again, you should now be able to use git flow normally.Sublime Merge vs SourceTree (Git client comparison) exit Sourcetree (through CMD+Q or quit in the menu bar).open the repository configuration again and rename branches mentioned in git flow configuration to match the renamed branches that you have, and save the config.from Sourcetree's branches list rename the local branches to what you're happy with.You can do that either from Sourcetree's git flow button, or manually through the terminal with git flow init -d or git flow init and then accepting all the default suggested values
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |