Masatake YAMATO <[EMAIL PROTECTED]> writes: > What I should do next? When I used tla, what I should was: > > 1. open a conflict file(e.g. lisp/bzr-core.el) > 2. C-s ======
smerge-mode is your friend (and xtla goes to smerge-mode when you open a conflicted file. > 3. Remove conflicts > 4. goto 2. till fixing all conflicts in a file. 4. M-x tla-resolved RET (Will refuse to run if you still have conflicts, run baz resolved if necessary, and remove the .rej file). This is to prevent you from commiting conflicts accidentally. > However, after switching baz, I got some conflicts represented as *rej and > *.orig files. > Does xtla provde useful functions to handle these files? If you use three-way merge, you'll get inline conflicts markers, and smerge-mode is your friend. Otherwise, the .rej file is a diff file, and diff-mode is your friend. See also http://wiki.gnuarch.org/Process_20_2a_2erej_20files . -- Matthieu
