[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Major change in conflict handling between 1.12.9 and 1.12.13?
From: |
Steve McIntyre |
Subject: |
Re: Major change in conflict handling between 1.12.9 and 1.12.13? |
Date: |
Thu, 1 Jun 2006 17:06:58 +0100 |
User-agent: |
Mutt/1.5.9i |
On Tue, May 30, 2006 at 12:43:31AM +0100, Steve McIntyre wrote:
>Hi,
>
>I've updated from 1.12.9 to 1.12.13 and I'm seeing a *really* major
>change in behaviour when conflicts happen; a merge conflict is only
>reported during the merge itself. The conflict marker itself is then
>lost on subsequent calls to update.
<snip>
>I can't believe this change was deliberate; it's rather worrying, and
>it breaks normal workflow - I've had several user complaints
>already. Should I raise a bug?
Any response from the developers? Derek? Mark?
--
Steve McIntyre, Cambridge, UK. address@hidden
"I can't ever sleep on planes ... call it irrational if you like, but I'm
afraid I'll miss my stop" -- Vivek Dasmohapatra
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?,
Steve McIntyre <=
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Mark D. Baushke, 2006/06/01
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Steve McIntyre, 2006/06/01
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Mark D. Baushke, 2006/06/01
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Jim Hyslop, 2006/06/01
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Stephanie Seibt, 2006/06/02
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Mark D. Baushke, 2006/06/02
- Message not available
- Message not available
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Stephanie Seibt, 2006/06/02
- Message not available
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Steve McIntyre, 2006/06/07
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Steve McIntyre, 2006/06/07
- Re: Major change in conflict handling between 1.12.9 and 1.12.13?, Steve McIntyre, 2006/06/07