In general, what is our policy on removing branches? Once they are mereged into dev? (e.g. if the lb42-procmod stuff is merged in, then should that go?) Or should various branches hang around until a release is final, and then tidied up shortly thereafter? -James On 18/03/16 11:22, Hugh Cayless wrote:

The Pure ODD branch can safely be removed now. Everything’s in dev.

...

On Mar 18, 2016, at 4:06 , Lou Burnard wrote:

That's my belief too

Sent from my Honor Mobile

-------- Original Message -------- Subject: [tei-council] Fwd: shivering ... From: Peter Stadler To: tei-council@lists.tei-c.org CC:

I forward Martin’s question … To my knowing, the Pure-ODD-branch has been merged into dev and does not need building at Jenkins anymore. Is this true?

Best Peter

...

Anfang der weitergeleiteten Nachricht:

Von: Martin Holmes Betreff: Aw: [tei-council] shivering ... Datum: 17. März 2016 um 16:54:40 MEZ An: Peter Stadler

There's some old cruft in the root jobs folder from something long ago, and there are some branches perhaps I could remove -- knowing what the Council is doing these days, do you think I need the Pure-ODD branches? -- 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

-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford

On 18/03/16 11:49, Hugh Cayless wrote:

I don’t think we have a policy as yet. Some time not too long after they get merged back into dev and work on them stops. Post-release is probably a good time to clean up leftover branches, but there’s no reason to keep them past their sell-by date.

Maybe we should say the branch owner is responsible for deleting branches that have been pushed to the repo after they stop work on them?

Fair enough, maybe with the caveat that the Chair will do a quick audit occasionally of all our branches and see which are still necessary. (i.e. having too many gets confusing if they are old) James

...

On Mar 18, 2016, at 7:41 , James Cummings wrote:

In general, what is our policy on removing branches? Once they are mereged into dev? (e.g. if the lb42-procmod stuff is merged in, then should that go?) Or should various branches hang around until a release is final, and then tidied up shortly thereafter?

-James

On 18/03/16 11:22, Hugh Cayless wrote:

...

The Pure ODD branch can safely be removed now. Everything’s in dev.

...

On Mar 18, 2016, at 4:06 , Lou Burnard wrote:

That's my belief too

Sent from my Honor Mobile

-------- Original Message -------- Subject: [tei-council] Fwd: shivering ... From: Peter Stadler To: tei-council@lists.tei-c.org CC:

I forward Martin’s question … To my knowing, the Pure-ODD-branch has been merged into dev and does not need building at Jenkins anymore. Is this true?

Best Peter

...

Anfang der weitergeleiteten Nachricht:

Von: Martin Holmes Betreff: Aw: [tei-council] shivering ... Datum: 17. März 2016 um 16:54:40 MEZ An: Peter Stadler

There's some old cruft in the root jobs folder from something long ago, and there are some branches perhaps I could remove -- knowing what the Council is doing these days, do you think I need the Pure-ODD branches? -- 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

-- 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

-- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford

you can delete a remote branch using git push origin --delete <oldbranch> or you can do it via the GitHub interface in Code / branches. I think if it's deleted remotely, then your tracking branch will get removed when you pull, unless it's ahead of the remote. On Thu, Mar 24, 2016 at 12:53 PM, Syd Bauman wrote:

...

I don’t think we have a policy as yet. Some time not too long after they get merged back into dev and work on them stops. Post-release is probably a good time to clean up leftover branches, but there’s no reason to keep them past their sell-by date.

Maybe we should say the branch owner is responsible for deleting branches that have been pushed to the repo after they stop work on them?

I think that's a fine idea. Just double-checking, would we use `git branch -d OLDBRANCH` or `git branch -D OLDBRANCH`, or does it matter? (And it looks like a deletion does not require a commit message; but one would have to push after executing the -d or -D, right?) -- 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