Karl Dahlke <[email protected]> writes: > and Chris did the same thingtoo, in another branch.
I discarded my changes after I saw that yours were pushed. Sorry for all the confusion. I had some spare cycles this morning, and I wanted to start moving forward. > previous rebase directory /home/eklhad/progs/edbrowse/.git/rebase-apply still > exists but mbox given. > You should run git am --abort to clear this up. My guess is that you ran git am at some point in the distant past and it failed, leaving that rebase-apply directory. So after --abort, you should be able to apply both of these. I've done it over here, so I can push them if need be. As an aside, in patch 4/4, we should probably use JS_H, rather than _JS_H. > if both those branches have zillions of changes to essentially the same lines > of code, > which is already the case for us, No, see above. My branch incorporates your eb_bool change, rather than my aborted one. -- Chris _______________________________________________ Edbrowse-dev mailing list [email protected] http://lists.the-brannons.com/mailman/listinfo/edbrowse-dev
