[be] [bug #23267] Merge: copies always master to edited

[Teus Benschop]

Update of bug #23267 (project bibledit):

                  Status:             In Progress => Ready For Test         
             Open/Closed:                    Open => Closed                 

    _______________________________________________________

Follow-up Comment #1:

I tried it with the newest version and it works fine. Using your example,
just remove e.g. "servant" in one project, then Merge, and see it being
removed in the other project as well.

The reason that it does not open the dialog with the alternatives is that
there are no alternative. Bibledit first tries to automatically merge
everything. Only in case of conflicts the dialog for conflict resolution
appears. For example when in one project "James" is changed to "Jacob", and in
the other project to "Joseph", then the conflict resolution dialog comes up
when trying to merge.

    _______________________________________________________

Reply to this item at:

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

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