1 |
On 2018-06-17 18:12, Mick wrote: |
2 |
|
3 |
> From the fine manual: |
4 |
> |
5 |
> z Zap (delete) the new config file and continue. |
6 |
|
7 |
So what do you do if the merge of this file is too hard and you want to |
8 |
do it another time? The answer seems to be q (quit) or n (next), but |
9 |
_nothing_ in the documentation says this is safe. |
10 |
|
11 |
> For files which have a lot of changes, some of which I wish to reject |
12 |
> and some to accept, I tend to use m (for merging). Again from the |
13 |
> fine manual: |
14 |
> |
15 |
> m Interactively merge the current and new config files. |
16 |
|
17 |
The problem (or multiple problems) here is that it doesn't say what is |
18 |
being merged into what (no, its not symmetric), and to compound that it |
19 |
doesn't just leave this file alone and quit or go on to the next file; |
20 |
it shows some diff again. What does this new diff mean? I can't make |
21 |
sense of it without answering my other questions. |
22 |
|
23 |
To clarify: I don't think this is simply a usability problem that can be |
24 |
addressed by using better or more verbose English. I think there is a |
25 |
"big picture", a concept of what is being done, and this concept has not |
26 |
found its way into the documentation or the UI itself. |
27 |
|
28 |
In particular, I suspect the developers think of it as merging my mods |
29 |
into the "official" packaged versions, while I want to handle it the |
30 |
other way: I see my version as the "master" or "trunk", and I want to |
31 |
merge the package mods into it. |
32 |
|
33 |
But I really don't know. I am confused :-P |
34 |
|
35 |
-- |
36 |
Please don't Cc: me privately on mailing lists and Usenet, |
37 |
if you also post the followup to the list or newsgroup. |
38 |
To reply privately _only_ on Usenet and on broken lists |
39 |
which rewrite From, fetch the TXT record for no-use.mooo.com. |