{"thread":{"id":"25568","subject":"Detect merge/rebase conflicts without changing the worktree?","startedAt":"2010-10-27T23:40:43Z","lastAt":"2010-10-28T10:01:34Z","messageCount":3,"participants":["Klas Lindberg","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"154589","messageId":"AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8=F05N_eGQ@mail.gmail.com","threadId":"25568","inReplyTo":null,"subject":"Detect merge/rebase conflicts without changing the worktree?","fromName":"Klas Lindberg","fromEmail":"klas.lindberg@gmail.com","sentAt":"2010-10-27T23:40:43Z","receivedAt":"2010-10-27T23:40:43Z","isPatch":false,"sender":{"key":"klas.lindberg@gmail.com","avatar":null},"body":"Hello\n\nWhat is the recommended way to detect merge/rebase conflicts without\nactually modifying the worktree? Should I use some combination of\ncustom $GIT_INDEX_FILE and --work-tree to lock the conflict resolution\ninto a directory specially made for this purpose? Is there even a way\nto have the conflict-annotated files written to stdout instead of to\nfile system when a merge fails?\n\nBR / Klas\n"},{"id":"154591","messageId":"20101028000115.GC30490@burratino","threadId":"25568","inReplyTo":"AANLkTikuyGcK-j_hT2WxJiYVX784nPehZS8=F05N_eGQ@mail.gmail.com","subject":"Re: Detect merge/rebase conflicts without changing the worktree?","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-10-28T00:01:15Z","receivedAt":"2010-10-28T00:01:15Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi Klas,\n\nKlas Lindberg wrote:\n\n> What is the recommended way to detect merge/rebase conflicts without\n> actually modifying the worktree?\n\nYou might like \"git merge-tree\".\n"},{"id":"154620","messageId":"AANLkTim8X1nwgMPLWme6s0KRUCZVDzUPYhgSbkrChN6D@mail.gmail.com","threadId":"25568","inReplyTo":"20101028000115.GC30490@burratino","subject":"Re: Detect merge/rebase conflicts without changing the worktree?","fromName":"Klas Lindberg","fromEmail":"klas.lindberg@gmail.com","sentAt":"2010-10-28T10:01:34Z","receivedAt":"2010-10-28T10:01:34Z","isPatch":false,"sender":{"key":"klas.lindberg@gmail.com","avatar":null},"body":"Thank you. I don't know how I missed that one  :-~\n\nOn Thu, Oct 28, 2010 at 2:01 AM, Jonathan Nieder <jrnieder@gmail.com> wrote:\n> Hi Klas,\n>\n> Klas Lindberg wrote:\n>\n>> What is the recommended way to detect merge/rebase conflicts without\n>> actually modifying the worktree?\n>\n> You might like \"git merge-tree\".\n>\n"}]}