[Gnash-commit] [bug #34697] data loss, commits vanish

[Bastiaan Jacques]

Update of bug #34697 (project gnash):

             Assigned to:                    None => bjacques               
             Open/Closed:                    Open => Closed                 

    _______________________________________________________

Follow-up Comment #6:

I suspect the cause of this issue is rather simpler: most of the changes of
6e229c0e were correctly retained in the merge. But the other parent of the
merge introduced a new line immediately preceeding the two lines removed in
6e229c0e (though the new line has since been commented out). Automatic
conflict resolution would have failed, and in the manual conflict resolution
presumably the lines were retained by accident.

I've re-removed the two lines in f8ca64a.

    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/bugs/?34697>

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