search

swcarpentry / DEPRECATED-bc

DEPRECATED: This repository is now frozen - please see individual lesson repositories.
Other
299 stars 383 forks source link

[meta] Branches at bc repository #617

Closed rgaiacs closed 9 years ago

rgaiacs commented 10 years ago

At #207 we agree with the branches master and gh-pages at bc repository. Right now we have branches:

This extra branches can confuse some of our new contributors. Should we remove it?

gvwilson commented 10 years ago

Yes, as long as we're sure it's not going to mess up outstanding pull requests - which is why I'm hesitating.

wking commented 10 years ago

On Wed, Jul 23, 2014 at 07:41:50AM -0700, r-gaia-cs wrote:

  • creating-lesson-on-regular-expressions

This points to 7d77216 (Merge pull request #567 from danmaclean/creating-lesson-on-regular-expressions, 2014-06-26). However, the commit that landed #567 in master is e821b8a (same metadata). Diff:

$ diff -u <(git show --pretty=fuller 7d77216) <(git show --pretty=fuller e821b8a) --- /dev/fd/63 2014-07-23 10:54:46.745059947 -0700 +++ /dev/fd/62 2014-07-23 10:54:46.746059947 -0700 @@ -1,11 +1,11 @@ -commit 7d77216f651b0b98f639d331d484c544ed6607b2 -Merge: 29917ba 43f04a6 +commit e821b8a99bb3df1f7bd4ab365a0b4c3ad69fa3ee +Merge: 7dee2f6 43f04a6 Author: Greg Wilson gvwilson@software-carpentry.org -AuthorDate: Thu Jun 26 07:49:07 2014 -0400 +AuthorDate: Tue Jun 24 11:19:59 2014 -0400 Commit: Greg Wilson gvwilson@software-carpentry.org -CommitDate: Thu Jun 26 07:49:07 2014 -0400 +CommitDate: Tue Jun 24 11:19:59 2014 -0400

I see both #564 and #567 pointing at the same commit (43f04a6, typo, 2014-07-24), so I think we can kill this branch.

ctjacobs commented 10 years ago

PR #599 wants to merge into 'swcarpentry:creating-lesson-on-regular-expressions'. Hopefully this will be changed to 'swcarpentry:master' before merging, but will the deletion of 'swcarpentry:creating-lesson-on-regular-expressions' cause a problem here?

wking commented 10 years ago

On Thu, Jul 24, 2014 at 01:15:06AM -0700, Christian Jacobs wrote:

PR #599 wants to merge into 'swcarpentry:creating-lesson-on-regular-expressions'. Hopefully this will be changed to 'swcarpentry:master' before merging, …

Can you change the target branch after submitting the pull request? I thought you had to merge by hand, or open a new pull request with the new target.