The git history looks a bit weird but everything seems to work okay.
I've removed the experimental-xml branch from the git repositories but I
get the following error when trying to remove the experimental branch,
verbal:/git/documents.git# git branch -d experimental
error: The branch 'experimental' is not a strict subset of your
current HEAD.
What should we do with that branch?
Tim 'Mithro' Ansell
On Tue, 2008-04-08 at 17:55 +0200, Krzysztof Sobolewski wrote:
> I said before that if there's no opposition, I'll merge experimental-xml
> branches of documents and libtpproto-java into master. This includes changes
> to protocol description that allow automatic generation of Object- and
> OrderParameters handling code.
>
> There was no opposition, so I'm pushing the merges :)
>
> It seems that while I was learning git I made a little mess in the
> repository (I tied to rebase where merge would be better, mixed commits to
> several branches etc.) but it seems it's all fine now. I hope you'll forgive
> me this :)
> _______________________________________________
> tp-devel mailing list
> [email protected]
> http://www.thousandparsec.net/tp/mailman.php/listinfo/tp-devel
_______________________________________________
tp-devel mailing list
[email protected]
http://www.thousandparsec.net/tp/mailman.php/listinfo/tp-devel
