<div dir="ltr">Thanks, this is a good proposal!<div style="cursor: auto;"><br></div><div style="cursor: auto;">I agree that cleanup is good and that we should have less branches and more clear conventions.</div><div style="cursor: auto;"><br></div><div style="cursor: auto;">Sometimes branches may be different to the main workshop, so I'm not sure if a tag would solve the problem.</div><div style="cursor: auto;">But whenever a tag (release) solves it, then it's perfectly fine. </div><div style="cursor: auto;"><br></div><div style="cursor: auto;">I'm actually not sure if it really makes sense to keep a long list of old workshops. </div><div style="cursor: auto;">Who will ever do the old one? Should we really encourage people to look at old ones?</div><div style="cursor: auto;">Maybe it would be even better to just have a single workshop.</div><div style="cursor: auto;"><br></div><div style="cursor: auto;">Regarding branch names, "main" is good and an alternative to "develop" could be "next". </div><div style="cursor: auto;">It is shorter and indicates that it will be the next release. If we already rename things, we could do this as well.</div><div style="cursor: auto;">We could also wait with renaming "master" as Github seems to prepare something that will prevent to break stuff:</div><div style="cursor: auto;"><a href="https://github.com/github/renaming">https://github.com/github/renaming</a><br></div><div style="cursor: auto;"><br></div><div style="cursor: auto;">Best regards,</div><div style="cursor: auto;">Daniel</div><div style="cursor: auto;"><br></div><div style="cursor: auto;"><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, 22 Dec 2020 at 07:20, Vicky Vergara <<a href="mailto:vicky@georepublic.de">vicky@georepublic.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Hello Rajat, <br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">I think cleaning up that repo is going to be good.<br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">I see your detailed proposal, and I think it is very clear on how to proceed so we do not lose any information<br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Thanks for the proposal, from my part it is a thumbs up.<br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Let's wait until next monday to see if someone else has a suggestion on how to proceed with the cleanup.<br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Thanks for your efforts<br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif"><br><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif"><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif"><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Dec 21, 2020 at 1:21 PM Rajat Shinde <<a href="mailto:rajatshinde2303@gmail.com" target="_blank">rajatshinde2303@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">Hello all,<br><br>The pgRouting community proposes cleanup of pgRouting/Workshop Github repository [1].<br>We should only have the following branches:<br>main [2]<br>develop<br>gh-pages<br><br>Some of the problems are:<br><ul><li>Some of the branches are 10 years old such as "FOSS4G2011" branch [3] which is already published at [4].</li><li>The FOSS4G Hokkaido workshop is not yet published on the pgRouting Workshop website [5] and the development of the "develop/hokkaido" branch is stalled since 2015 [6].</li><li>Many branches start with "develop/" (the "/" normally indicates it belongs to a repository named develop).</li></ul><div>This last example is causing some development issues: We are working on having a configured workshop and had to name the working branch as "general-develop" branch due to the lack of "develop" branch and many existing "develop/foo" branches, creating confusion about the correct branch for developing.<br><br>Proposal to cleanup of the Workshop repository:<br>Remember that Github handles tags with semantic versioning, the latest version corresponds to the last pushed tag and any new tags for the stalled branches will not be versioned tags.<br><br>The cleanup would comprise of following steps:<br><ol><li>Make sure that tags exist for the international FOSS4G workshops</li><ol><li>Find the versioned number corresponding to the international branch</li><li>If it does not exist, then create a tag with the name: FOSS4G<YEAR><PLACE></li><li>Delete the branch</li></ol><li>Make sure that tags exist for the local FOSS4G workshops</li><ol><li>These are not versioned</li><li>Find a corresponding tag for the local branch</li><li>If it does not exist, then create a tag with the name: <PLACE><LAST YEAR OF MODIFICATION></li><li>Delete the branch</li></ol><li>Rename "general-develop" to "develop"</li><ol><li>Create branch "develop" based on "general-develop"</li><li>Delete branch "general-develop"</li></ol><li>Rename "master" to "main"</li><ol><li>Create branch "main" based on "master"</li><li>Pending the delete of "master" until things work properly on Github for branch "main"</li></ol></ol>If this proposal is accepted, I will open an administrative issue on the pgRouting/Workshop Github repository [7], to keep track of all the steps mentioned. The related tags will be placed as Github issues and before removing any branch, a comment will be posted to get thumbs up. A comment will follow post removal of the branch as well.<br><br>Thanks!<br>Kind regards,<br>pgRouting Team<br><br>[1] <a href="https://github.com/pgRouting/workshop/branches/all" target="_blank">https://github.com/pgRouting/workshop/branches/all</a><br>[2] <a href="https://github.com/github/renaming" target="_blank">https://github.com/github/renaming</a><br>[3] <a href="https://github.com/pgRouting/workshop/tree/foss4g2011" target="_blank">https://github.com/pgRouting/workshop/tree/foss4g2011</a><br>[4] <a href="https://workshop.pgrouting.org/0.6.1/en/index.html" target="_blank">https://workshop.pgrouting.org/0.6.1/en/index.html</a><br>[5] <a href="https://workshop.pgrouting.org/" target="_blank">https://workshop.pgrouting.org/</a><br>[6] <a href="https://github.com/pgRouting/workshop/tree/develop/hokkaido" target="_blank">https://github.com/pgRouting/workshop/tree/develop/hokkaido</a><br></div><div>[7] <a href="https://github.com/pgRouting/workshop" target="_blank">https://github.com/pgRouting/workshop</a></div></div>
_______________________________________________<br>
pgrouting-dev mailing list<br>
<a href="mailto:pgrouting-dev@lists.osgeo.org" target="_blank">pgrouting-dev@lists.osgeo.org</a><br>
<a href="https://lists.osgeo.org/mailman/listinfo/pgrouting-dev" rel="noreferrer" target="_blank">https://lists.osgeo.org/mailman/listinfo/pgrouting-dev</a><br>
</blockquote></div><br clear="all"><br>-- <br><div dir="ltr"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><pre>Georepublic UG (haftungsbeschränkt)
Salzmannstraße 44,
81739 München, Germany
Vicky Vergara
Operations Research
eMail: vicky@<a href="http://georepublic.de" target="_blank">georepublic.de</a>
Web: <a href="https://georepublic.info" target="_blank">https://georepublic.info</a>
Tel: +49 (089) 4161 7698-1
Fax: +49 (089) 4161 7698-9
Commercial register: Amtsgericht München, HRB 181428
CEO: Daniel Kastl
<span></span></pre></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div>
_______________________________________________<br>
pgrouting-dev mailing list<br>
<a href="mailto:pgrouting-dev@lists.osgeo.org" target="_blank">pgrouting-dev@lists.osgeo.org</a><br>
<a href="https://lists.osgeo.org/mailman/listinfo/pgrouting-dev" rel="noreferrer" target="_blank">https://lists.osgeo.org/mailman/listinfo/pgrouting-dev</a><br>
</blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><span style="font-family:arial,sans-serif;font-size:13px;border-collapse:collapse">Georepublic UG & Georepublic Japan<br>eMail: <a href="mailto:daniel.kastl@georepublic.de" style="color:rgb(66,99,171)" target="_blank">daniel.kastl@georepublic.de</a><br>Web: <a href="https://georepublic.info" target="_blank">https://georepublic.info</a></span><div><br></div><div><br></div><div><br></div></div></div></div></div>