Is it possible to use Meld as a merge tool when using Git Extensions on Windows?
相关问题
- meld on OS X 10.7 doesn't work?
- How to use Beyond Compare 3 as external SVN (SlikS
- Git running Meld as merge tool fails 'check_re
- How to use different merge and diff tool in git?
- Using IntelliJ as git mergetool always exits as so
相关文章
- How to use different merge and diff tool in git?
- Using IntelliJ as git mergetool always exits as so
- Git Extensions stored wrong credentials [duplicate
- The fingerprint of this host is not registered by
- Can't manage to load my private key with git e
- How to remove/hide GitExtensions toolbar from Visu
- How do I make git automatically open the mergetool
- meld - GLib-GIO-ERROR**: No GSettings schemas are
Yes it is, in response to this issue.
Like Thomas, the accepted answer didn't quite work for me. The merged file was not saved after meld was closed. However, Thomas's answer didn't work for me either. While the file did save, it opened in Meld with the merged markup.
Instead, I'm using a command line I've been using with Sourcetree. Here's what worked for me.
In Git Extension: Settings -> Git Config
This answer is correct. The other answer won't save the merge result/ changes to your actual workspace file!
In Git Extension: Settings -> Git Config
I had been struggling to get Meld working with GitExtensions, trying the previous answer & related posts.
This is a revised answer -- I had previously posted the command-line 'git mergetool' uses, but that didn't offer a clean 3-way merge with ancestor; instead the center pane showed conflict markers.
See also my GitHub comment on the GitExtensions feature-request discussing this.