I don't think we really have one, and we should. I was planning to do some pruning post-release, so your question is very timely. I agree with your proposed "rules". Maybe keep the release branch until the next release? I believe the P5* branches were imported from svn and represent the work that went into creating P5. Of some historical interest, but not likely to help us in our day-to-day work--all of the history that actually made it into the current repo would still be available if they were pruned. We should add a section on branching to the documentation too. As a quick reminder, we agreed branches for work in progress should be named <GitHub user ID>-<short title>, so we know who's responsible for the branch. If any of you have branches that you pushed to GitHub which you think are now past their sell-by date, would you mind removing them? I will probably do a culling over the holidays. Hugh

On Dec 16, 2016, at 06:17, James Cummings wrote:

Hi all,

What is our policy on keeping old branches around? I suppose it makes sense to keep the release ones (for awhile at least), but I've just gone and deleted the att.global.source one since I believe that all got merged in. Why do some branches that have been merged in seem to still be X number of commits ahead of dev?

I notice that we have 23 branches so wondered if we shouldn't be getting rid of some of those. The current list of branches is at:

https://github.com/TEIC/TEI/branches/all

Ones that I'd probably assume should be deleted include:

lb42-procmod (I assume this is all merged in though it says 498/25 (that is 498 behind dev, 25 ahead) .. that 25 makes me nervous.

msFrag (517 behind)

hcayless-appcrit (674/32)

sydb-xenodata (691/65)

peterstadler-antify (13560/12861 !) Not sure what this was for? Peter?

P5 (13566/56) Might be a confusing branch name? Was this an archival one? Rename if keeping?

P5-Council (last updated 8 years ago? Is this a historical one? Does it have anything interesting?)

P5-selections (updated 10 years ago by sydb)

Just thought I'd mention it since I think we should have branches for dev, master, release-X.Y.Z, gh-pages, and $anythingWeAreCurrentlyWorkingOn (Plus maybe a couple historical ones like sf/trunk?)

What do others think?

-James

-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

PLEASE NOTE: postings to this list are publicly archived