
Watch this advanced Git tutorial video to learn more about merge conflicts in Git and when they occur.
How do you perform an interactive rebase?. How do you Git push to a remote branch?. How do you create a GitHub pull request?. Can you cherry pick multiple commits in Git?. Can you cherry pick from another repository in Git?. How do you set an upstream branch in Git?. How do you delete a remote branch in Git?. How do you delete a local branch in Git?.
How do you checkout a remote branch in Git?. See our information on translating WinMerge into your own language. In addition, WinMerge is translated into a number of different languages. WinMerge is an open source project, which means that the program is maintained and developed by volunteers. If you need support, look at our support page for more information how you can get it. WinMerge 2.16.22 is the latest stable version, and is recommended for most users. Online manual and installed HTML Help manual. Shell Integration (supports 64-bit Windows versions). Creates patch files (Normal-, Context- and Unified formats). Shows CSV/TSV file contents in table format. Can highlight the differences with blocks. Can show folder compare results in a tree-style view. Compares one folder or includes all subfolders. Fast compare using file sizes and dates. Regular Expression based file filters allow excluding and including items. Location pane shows map of files compared. Difference pane shows current difference in two vertical panes. Flexible editor with syntax highlighting, line numbers and word-wrap. Visual differencing and merging of text files. Handles Windows, Unix and Mac text file formats. Supports Microsoft Windows XP SP3 or newer. In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible: General WinMerge can be used as an external differencing/merging tool or as a standalone application. WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. See the screenshots page for more screenshots. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.
WinMerge is an Open Source differencing and merging tool for Windows.