search

swcarpentry / DEPRECATED-bc

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

Changed pull request info #844

Closed IanHenry closed 9 years ago

IanHenry commented 9 years ago

just wanted it to be clear on master branch too

rgaiacs commented 9 years ago

AFAIR we agree to drop the master branch. We didn't remove it just to avoid problems with pull requests to it.

I'm +1 to close this PR without merge it.

IanHenry commented 9 years ago

I guess the issue is that if you don't know that you are supposed to use gh-pages (and assume to use master), and therefore you read the documentation on the master branch then you wouldn't know you were doing something wrong.

Speaking to a few other new contributors this was a definitely a source of confusion. So I would suggest it is changed in both branches (possibly there is a better method to do this then merging both my pull requests on the two branches, but I'm new to git)

gvwilson commented 9 years ago

Yes, we should have updated our instructions - I've put in a pull request against the gh-pages branch, and if it looks good, I'll merge it into master as well. Sorry for creating confusion.

wking commented 9 years ago

On Fri, Nov 07, 2014 at 05:31:15PM -0800, Raniere Silva wrote:

AFAIR we agree to drop the master branch. We didn't remove it just to avoid problems with pull requests to it.

Sure but both branches currently have notes saying you should use ‘master’ for pull requests. I'd merge this one, rebase #835 onto the new master, merge that, and then merge the new master into gh-pages:

         o             #844
        / \  
o---o---o---o       master
 \            \ /   \
   \           o     \     #845-rebased
    \                   \
      \                    \
o----o---o---o-------o  gh-pages

That way folks looking at both master and gh-pages see that the branch is closed down. Then I'd close any open or new PRs against master.

wking commented 9 years ago

On Sat, Nov 08, 2014 at 08:43:13AM -0800, W. Trevor King wrote:

‘master’ for pull requests. I'd merge this one, rebase #835 onto the

Oops, should be “rebase #845”.

rgaiacs commented 9 years ago

I'd merge this one, rebase #845 onto the new master, merge that, and then merge the new master into gh-pages:

@wking This looks good to me.