search

swcarpentry / DEPRECATED-bc

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

Extract history of home page and setup instructions #879

Closed gvwilson closed 9 years ago

gvwilson commented 9 years ago

Work on: A branch of https://github.com/swcarpentry/workshop-template

See also https://github.com/swcarpentry/workshop-template/issues/1#issuecomment-62718977

pipitone commented 9 years ago

i'm so stumped by this. I"ve tried a few things to copy over history for a file, but I just end up making a bloody mess. It looks like prepending history to the index.html file is possible but when i try it, github refuses to run the pull request because the branch history differs.

Can someone (@jiffyclub or @wking perhaps) suggest how i ought to be going about this?

i'm just trying to copy the history of index.html from the bc repo.

wking commented 9 years ago

On Mon, Dec 01, 2014 at 08:22:06PM -0800, Jon Pipitone wrote:

… github refuses to run the pull request because the branch history differs.

I wouldn't worry about creating a pull request. Just push your branch somewhere and say “I think this is what the history should look like”. Once the maintainers have checked your branch, they can force-push it to master. They'll have to ping authors of any outstanding PRs to rebase their work (for green-button merges), or use rebase themselves to merge any work based on the current master 1, but once the new history is live for a bit things will settle back down to normal.

gvwilson commented 9 years ago

+1 to brute forcing this.

wking commented 9 years ago

Can this be closed since https://github.com/swcarpentry/workshop-template/pull/83#issuecomment-67391624 ?