I don't understand bazaar. I'm afraid I'm merging and committing without a slightest idea of what will be the result of the operation. After resolving the conflicts I wanted to create a new diff. However I first performed a commit because the output from diff was huge (and those were hardly just my changes from conflict resolution) and merge wouldn't merge since I have not committed anything. Now when I type bzr diff it outputs nothing. So how do I report my latest diff from the trunk?
If I type bzr merge I am getting a message about text conflict in libcore/asobj/NetConnection_as.cpp but I see no such file anywhere on my drive. There is also a message about text conflict in libmedia/gst/MediaParserGst.cpp but when I open that file I see no conflict markers. _______________________________________________ Gnash-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnash-dev
