From: Miles Bader <miles.bader@necel.com>
To: Nick Roberts <nickrob@snap.net.nz>
Cc: emacs-devel@gnu.org
Subject: Re: svn and smerge-mode
Date: Wed, 27 Aug 2008 11:37:54 +0900 [thread overview]
Message-ID: <buoej4b89od.fsf@dhapc248.dev.necel.com> (raw)
In-Reply-To: <18611.52098.805757.689913@kahikatea.snap.net.nz> (Nick Roberts's message of "Tue, 26 Aug 2008 21:23:14 +1200")
Nick Roberts <nickrob@snap.net.nz> writes:
> With Emacs 23.0.60, visiting a file with conflicts under SVN control puts it
> into smerge-mode. I think this is too prescriptive. On the few occasions that
> I need to resolve conflicts I do it by hand and I've lost information trying to
> use smerge-mode. If someone wants smerge-mode they can easily turn it on.
No, if smerge-mode is causing information loss without user action that
should be fixed.
-Miles
--
Run away! Run away!
next prev parent reply other threads:[~2008-08-27 2:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-26 9:23 svn and smerge-mode Nick Roberts
2008-08-26 13:46 ` Stefan Monnier
2008-08-27 8:43 ` Nick Roberts
2008-08-27 17:47 ` Stefan Monnier
2008-08-27 2:37 ` Miles Bader [this message]
2008-08-27 8:47 ` Nick Roberts
2008-08-27 9:36 ` Miles Bader
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=buoej4b89od.fsf@dhapc248.dev.necel.com \
--to=miles.bader@necel.com \
--cc=emacs-devel@gnu.org \
--cc=miles@gnu.org \
--cc=nickrob@snap.net.nz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.