[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Conflicts/*.rej files
From: |
Brian May |
Subject: |
[Gnu-arch-users] Conflicts/*.rej files |
Date: |
Sun, 28 Dec 2003 10:58:51 +1100 |
User-agent: |
Mutt/1.5.4i |
Hello,
Sorry if this is a FAQ or something. If so, please point it to me (I
couldn't see anything).
What is the best of way of managing *.rej files?
So far, I have done this manually, but IMHO it is not as easy as inline
{CVS,subversion} conflict markers.
In the past people have said to use vim's diff mode or emacs ediff
mode, but I couldn't work out how to use the *.rej file.
Also, is there any good reason why it is not treated as an error if you
do a {update,replay,commit} operation when there are *.rej files in the
archive (at least this is what the tutorial says)?
--
Brian May <address@hidden>
- [Gnu-arch-users] Conflicts/*.rej files,
Brian May <=