From: Klas Lindberg <klas.lindberg@gmail.com>
Date: Wed, 27 Oct 2010 23:40:43 GMT
Subject: Detect merge/rebase conflicts without changing the worktree?
Message-ID: <AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8=F05N_eGQ@mail.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