Programming Language
Abap
ActionScript
Assembly
BASIC
C
C#
C++
Clojure
Cobol
CSS
Dart
Delphi
Elixir
Erlang
F#
Fortran
Go
Groovy
Haskell
Html
Java
Javascript
Julia
Kotlin
Lisp
Lua
Matlab
Objective-C
Pascal
Perl
PHP
Prolog
Python
R
Ruby
Rust
Scala
Scheme
Shell/Bash
SQL
Swift
TypeScript
VBA
Framework
AngularJS
Backbone
Bootstrap CSS
Bootstrap Javascript
Bulma
CakePHP
CodeIgniter
Django
Drupal
Ember
Express
Flask
Flutter
Foundation
Ionic
jQuery
Laravel
Materialize
Next.js
Node.js
Nuxt.js
React
Semantic UI
Spring
Symfony
Unity
Vaadin
Vue
Wordpress
Yii
Zend
Categories
Tags
Mergetool
New post in Mergetool
Configure a merge tool for GitKraken on Windows10
May 22nd, 2020
git
mergetool
How to use opendiff as default mergetool
April 26th, 2020
opendiff
git
mergetool
What should I do when git revert aborts with an error message?
July 8th, 2022
git
commit
mergetool
git-revert
How can I make WinMerge my git mergetool?
January 15th, 2022
winmerge
git
difftool
mergetool
How do I use vimdiff to resolve a git merge conflict?
July 8th, 2022
mergetool
git
git-merge-conflict
vim
git-merge
Git: How can I configure KDiff3 as a merge tool and diff tool?
March 6th, 2022
git
kdiff3
mergetool
git-merge
How do I check which merge tool I use?
June 7th, 2022
mergetool
git
How could I force mergetool GUI (KDiff3) to be always shown?
June 14th, 2022
git-merge
kdiff3
mergetool
git
Is there a way to make Git mark a file as conflicted?
July 27th, 2022
mergetool
merge
git