semester-biology icon indicating copy to clipboard operation
semester-biology copied to clipboard

Add detailed docs on contributing upstream

Open ethanwhite opened this issue 8 years ago • 1 comments

See #619 and #620 for motivation and draft of language/approach.

ethanwhite avatar Jan 10 '17 18:01 ethanwhite

After a second try, much tears and hair pulling, I think the following would be helpful

first check that upstream repository is linked:

git remote -v

if not

git remote add upstream https://github.com/datacarpentry/semester-biology.git
git fetch upstream

make changes for class

git add stuff.md
git commit -m "Changes for just your class"
<make changes>
git add stuff.md
git commit -m "Upstream changes"
git log
<note hash(es) for upstream changes commit(s)>
git checkout upstream/gh-pages
git checkout -b upstream-changes
git cherry-pick firsthash secondhash
git push origin upstream-changes
<open PR>
<reattach your head!>
git checkout gh-pages

atyre2 avatar Jan 30 '17 21:01 atyre2