Date: prev next · Thread: first prev next last



hello all,

so yesterday a contributor sent a pull request to the wrong branch, trying to fix a problem that had already been fixed on the actual branch. the confusing branch names in the git repo aren't helping anyone so i just did some renaming.

first, "master" used to be the 0.9 release branch, so it is called "0.9" now.

this unfortunately destroyed the website, because GitHub Pages *requires* that the branch be called "master", and i just deleted it.

so i've copied the "1.0.0_SNAPSHOT" branch to "master" and set up GitHub Pages again and https://tdf.github.io/odftoolkit/ shows some content again.

i don't think we need the "1.0.0_SNAPSHOT" branch; i've edited the 2 outstanding pull requests for it to point to "master" instead, and propose to delete "1.0.0_SNAPSHOT" unless somebody has a good reason to keep it.

so... if you have the old "master" checked out, you might get some warning on the next "git pull", then just check out the "0.9" branch and carry on.

(i would have preferred to call it "main" or "trunk" or something but sadly GitHub Pages is very insistent.)

if you have the old "1.0.0_SNAPSHOT" branch checked out, then git pull and check out "master" instead, which contains the same commits.

sorry for the confusion :)

--
To unsubscribe e-mail to: dev+unsubscribe@odftoolkit.org
Problems? https://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: https://wiki.documentfoundation.org/Netiquette
List archive: https://listarchives.odftoolkit.org/dev/
Privacy Policy: https://www.documentfoundation.org/privacy

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.