![]() ![]() I've tried a lot of the tools mentioned here and none of them have quite been what I'm looking for. Two base, two changes, and one resulting merge. ![]() PS: If one tool one day supports 5 views merging, this would really be awesome, because if you cherry-pick commits in Git you really have not one base but two. This makes merging somewhat harder in complex cases. The merge view (see screenshot) has only 3 panes, just like SourceGear Diff/Merge. So you can have some history diff on all files much simpler. Meld is a newer free tool that I'd prefer to SourceGear Diff/Merge: Now it's also working on most platforms (Windows/Linux/Mac) with the distinct advantage of natively supporting some source control like Git. Check that merge screens-shot and you'll see it's has the 3 views at least. SourceGear Diff/Merge may be my second free tool choice. Perforce tries to make it a bit hard to get their tool without their client. You cannot edit manually the files and you cannot manually align. My main disappointement with that tool is its kind of "read-only" interface. The Perforce Visual Client ( P4V) is a free tool that provides one of the most explicit interface for merging (see some screenshots). It has many features like advanced rules, editions, manual alignment. It integrates with many source control and works on Windows/Linux. It's somewhat less visual than P4V but way more than WinDiff. The good thing with its merge is that it let you see all 4 views: base, left, right, and merged result. The Github desktop is an extension of the GitHub workflow.Beyond Compare 3, my favorite, has a merge functionality in the Pro edition. As it is designed by Github, it comes with tons of features, specifically for VCS. In fact, experts recommend this as the first choice when you implement GitHub to host your projects. ![]() One of the best Git GUI clients for Windows is the Github Desktop, which has been created by Github. GitBox This GIt GUI client has claimed that working with Git commands and operations can be easy as checking your mail. ![]() GitUp GitUp is a Git GUI client specifically for Mac users. The free version of ExamDiff is available as a portable program and installer. Diffuse has been designed specifically for the comparison of code. DiffMerge does not display a file selection dialog on start. AptDif is a visual file comparison tool for Windows.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |