# Detect merge/rebase conflicts without changing the worktree?

3 messages from 2010-10-27 to 2010-10-28. Participants: Klas Lindberg, Jonathan Nieder.
Thread: https://gitlist.dev/t/25568

## Klas Lindberg, 2010-10-27 23:40

Subject: Detect merge/rebase conflicts without changing the worktree?
Message-ID: <AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8=F05N_eGQ@mail.gmail.com>
URL: https://gitlist.dev/e/AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8%3DF05N_eGQ%40mail.gmail.com

```
Hello

What is the recommended way to detect merge/rebase conflicts without
actually modifying the worktree? Should I use some combination of
custom $GIT_INDEX_FILE and --work-tree to lock the conflict resolution
into a directory specially made for this purpose? Is there even a way
to have the conflict-annotated files written to stdout instead of to
file system when a merge fails?

BR / Klas

```

## Jonathan Nieder, 2010-10-28 00:01

Subject: Re: Detect merge/rebase conflicts without changing the worktree?
Message-ID: <20101028000115.GC30490@burratino>
URL: https://gitlist.dev/e/20101028000115.GC30490%40burratino
In-Reply-To: <AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8=F05N_eGQ@mail.gmail.com>

```
Hi Klas,

Klas Lindberg wrote:

> What is the recommended way to detect merge/rebase conflicts without
> actually modifying the worktree?

You might like "git merge-tree".

```

## Klas Lindberg, 2010-10-28 10:01

Subject: Re: Detect merge/rebase conflicts without changing the worktree?
Message-ID: <AANLkTim8X1nwgMPLWme6s0KRUCZVDzUPYhgSbkrChN6D@mail.gmail.com>
URL: https://gitlist.dev/e/AANLkTim8X1nwgMPLWme6s0KRUCZVDzUPYhgSbkrChN6D%40mail.gmail.com
In-Reply-To: <20101028000115.GC30490@burratino>

```
Thank you. I don't know how I missed that one  :-~

On Thu, Oct 28, 2010 at 2:01 AM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Hi Klas,
>
> Klas Lindberg wrote:
>
>> What is the recommended way to detect merge/rebase conflicts without
>> actually modifying the worktree?
>
> You might like "git merge-tree".
>

```