From bbcadcb35e4f036b8f992660de8089e298976627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?imme=C3=ABmosol?= Date: Wed, 22 Jun 2022 13:47:15 +0200 Subject: [PATCH] Hint at improved merge conflict resolving (#10840) --- doc/articles/resolving-merge-conflicts.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/articles/resolving-merge-conflicts.md b/doc/articles/resolving-merge-conflicts.md index 2733a186a..5a433556a 100644 --- a/doc/articles/resolving-merge-conflicts.md +++ b/doc/articles/resolving-merge-conflicts.md @@ -47,6 +47,12 @@ php composer.phar validate php composer.phar install [--dry-run] ``` +## Automating merge conflict resolving with git + +Some improvement _could_ be made to git's conflict resolving by using a custom git merge driver. + +An example of this can be found at [balbuf's composer git merge driver](https://github.com/balbuf/composer-git-merge-driver). + ## Important considerations Keep in mind that whenever merge conflicts occur on the lock file, the information, about the exact version