12/22/2023 0 Comments Araxis merge sourcetreePerforce, the company best known for its enterprise version control platform, also offers a solid diff tool: P4Merge is free of charge and comes with a basic feature set that makes it an interesting option on Windows, macOS and Linux. DeltaWalker supports Windows, macOS and Linux. If you're regularly performing comparisons on a folder basis, it's good to know that DeltaWalker shines with great performance in this area. However, it goes one step further by letting you compare file archives like ZIP, JAR, and TAR files. Much like Araxis, the DeltaWalker diff tool also lets you compare office files. The project hasn't seen many updates in recent years (though you may be able to find more recent releases through this page), but it remains a solid diff and merge tool that should satisfy basic needs. KDiff3Īnother free and open source tool answers to the name of KDiff3. It comes in standard and professional editions, and for people working on both Windows and macOS, it's good to know that a single license is valid for both platforms. It also lets you compare office documents (like MS Word, Excel, Powerpoint, or ODF). Just like Beyond Compare, Araxis Merge supports more than just text and image files. The "Pro" version also includes a solid three-way merge. It goes well beyond (pun intended) diffing simple text and also allows comparing PDF, Excel and image files. The Beyond Compare team makes a fine diff tool for Windows (as well as macOS and Linux, by the way). Apart from diffing files, Meld also supports comparison of folders. It supports three-way comparing and merging and lets you edit files directly from the comparison view. So for example you could have a deployment script which took the $SHA parameter, then right-click on a commit and run your deployment script for that specific commit right from within SourceTree.Being free and open source, Meld is a very popular tool on Windows (it's also available for Linux). If you use the $FILE or $SHA parameters, then these will cause the action to appear on context menus associated with files or commits, and will pass that context to the command. Or, I can just press Shift-T to open my repository in TextMate whenever I want. Notice how all I had to do was specify the location of the script I wanted to run, and then give it some parameters – in this case ‘$REPO’ which is the path to the repository.Īfter I click OK, an ‘Open in TextMate’ option will appear on the top-level Actions menu under the Custom Actions section: Maybe you have scripts that you’d like to call, or external tools that you’d like to use beyond what SourceTree already allows for – Custom Actions are the way to go.Īs a simple example, let’s say you use TextMate for editing files in a project, and you wanted to assign a keyboard shortcut to open the root of the repository in TextMate? SourceTree doesn’t provide an in-built option for that, so let’s add it using Custom Actions.įirstly, open the Preferences window, and select the ‘Custom Actions’ tab:Ĭlick ‘Add’, and fill in the details as follows (to fill in the keyboard shortcut, just lick on the shortcut area and type a keyboard combination): SourceTree 1.3’s new ‘Custom Actions’ feature lets you extend the range of actions you can perform from within the GUI, effectively adding your own commands. Custom actions – more power to you By Steve on February 8, 2012
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |