From: Alireza Date: Tue, 21 Jul 2020 17:16:59 GMT Subject: Re: Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately Message-ID: In-Reply-To: > If there were an option to allow git log for a merge to show the > difference between what an automatic merge would do (complete with > conflicts) and the end-state that was committed, then the resolution > would become very accessible and the rest of your request would be > moot. Happy to see there's already some interest to make this easier. However, my main use case is not just to see those changes, ideally it should be a separate commit to be easily reviewed in a PR, for example, otherwise the reviewer must pull all changes locally, which doesn't sound like an improvement, IMO.