> On 12 Jul 2015, at 15:45, Dirk Hohndel <[email protected]> wrote: > > Why would you need -rebase for the libgit2 repository, unless you have > local changes (and I just realize that I need to patch the build script to > use a later commit there, anyway, as that one still doesn't work with > proxies).
OK, maybe the rebase in libgit is a bit too eager. > And since I frequently force push into the Subsurface-testing > branches of libdc and marble, I'm not sure what benefit -rebase gives you > there. You usually need to remove those directories and check out fresh > copies for things to be in a consistent state. Rebase can actually cope with a force push automatically. It’s pretty awesome, as some would say. On several occations when the build fails, it’s in the middle of a merge in either libdc or (recently) marble. Then I just go to the project in question, abort the merge, and do a git pull —rebase. Voila, build.sh can continue. By adding this to the script I don’t have to intervene manually. Henrik _______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
