* Detect merge/rebase conflicts without changing the worktree? @ 2010-10-27 23:40 Klas Lindberg 2010-10-28 0:01 ` Jonathan Nieder 0 siblings, 1 reply; 3+ messages in thread From: Klas Lindberg @ 2010-10-27 23:40 UTC (permalink / raw) To: git 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Detect merge/rebase conflicts without changing the worktree? 2010-10-27 23:40 Detect merge/rebase conflicts without changing the worktree? Klas Lindberg @ 2010-10-28 0:01 ` Jonathan Nieder 2010-10-28 10:01 ` Klas Lindberg 0 siblings, 1 reply; 3+ messages in thread From: Jonathan Nieder @ 2010-10-28 0:01 UTC (permalink / raw) To: Klas Lindberg; +Cc: git 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". ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Detect merge/rebase conflicts without changing the worktree? 2010-10-28 0:01 ` Jonathan Nieder @ 2010-10-28 10:01 ` Klas Lindberg 0 siblings, 0 replies; 3+ messages in thread From: Klas Lindberg @ 2010-10-28 10:01 UTC (permalink / raw) To: Jonathan Nieder; +Cc: git 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". > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-28 10:01 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-10-27 23:40 Detect merge/rebase conflicts without changing the worktree? Klas Lindberg 2010-10-28 0:01 ` Jonathan Nieder 2010-10-28 10:01 ` Klas Lindberg
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).