[be] [bug #23543] Approve in Merge not working

[Teus Benschop]

Follow-up Comment #3, bug #23543 (project bibledit):

You are doing everything correctly.

The first window that comes up asks the user to select whether to use
"nnnenyika" or "nenyikaaa". The merger does not know which of the two to take,
because both words are different and occur in the same place.

After clicking OK in that window, the changes show up nicely, see the two
attached screenshots.

However, there is something to be improved here so that the lines wrap. At
present one needs to scroll the window to see everything. I'll change that.

The "hallo" between "Pakutanga hallo Mwari" does not ask for approval,
because that one already was in the master project, and remained there, so no
approval was needed.

The "hallo" between "akasika hallo denga" needs approval because it would be
merged into the master project. On the screenshot it shows that approval is
requested, and the + indicates it is something that is added to the master
project.

Then finally, depending on whether "nnnenyika" or "nenyikaaa" in the conflict
resolver, if "nnnenyika" was chosen it won't ask for approval, because that
one is already in. But if was selected, as in the case of the attached
screenshots, then it asks for approval of these


(file #15853, file #15854)
    _______________________________________________________

Additional Item Attachment:

File name: Screenshot-Bibledit - merge2.png Size:207 KB
File name: Screenshot-Bibledit - merge2-1.png Size:187 KB


    _______________________________________________________

Reply to this item at:

  <http://savannah.nongnu.org/bugs/?23543>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.nongnu.org/