threads / discuss / 25568

Detect merge/rebase conflicts without changing the worktree?

Subject: Detect merge/rebase conflicts without changing the worktree?

## tl;dr

3 messages between Oct 27, 2010 and Oct 28, 2010.

replies: 2people: 2as markdown or json

Klas Lindberg· Oct 27, 2010, 23:40 UTC · lore

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· Oct 28, 2010, 00:01 UTC · re: Klas Lindberg · lore

Re: Detect merge/rebase conflicts without changing the worktree?

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· Oct 28, 2010, 10:01 UTC · re: Jonathan Nieder · lore

Re: Detect merge/rebase conflicts without changing the worktree?

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:

Show 9 quoted lines

> 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".
>