git: Solve merge conflicts without performing a merge
<p>I just want to know, if there is any way, to resolve merge commits, of two git branches, without actually merging them.</p>

<p>Assuming, I  have a branch "featureMy"; my colleague created another branch "featureHis". Both branches are created on "master" branch.</p>

<p>My colleague then created a merge request for his branch "featureHis" into master. When I then create my merge request of "featureMy" into master, I want to ensure, that it will not conflicts with master after "featureHis" is merged.</p>

<p>Usually, I will merge "featureHis" into "featureMy" before. However, this is not that satisfying, because I have a additional merge commit as "noise" and my merge request will contain changes from "featureHis".</p>

<p>Is there a way, so that I can solve the merge conflicts, without creating a merge commit?</p>

<p>Kind regards</p>