Using GitHub

Process

	github.com/[org]/[repo] (org web)	github.com/[user]/[repo] (user web)	~/github/[repo] (user local)
->1x		-> fork	-> clone
<-	merge pull request {admin} <-	<- [pull request](Fork & Pull Model)	<- push, <-> commit

where:

• [org] is an organization (eg ohi-science)
• [repo] is a repository in the orgranization (eg ohicore, ohiprep, etc.)
• [user] is your github username

Resolving Conflicts

See:

• Resolving a merge conflict from the command line · GitHub Help:
• https://github.com/OHI-Science/ohiprep/pull/15

# on BB's Mac, go to temporary folder
cd ~/GitHub_Mac/tmp

# clone repo for which I have admin
git clone https://github.com/ohi-science/ohiprep.git
cd ohiprep

# checkout a new branch and pull other repo onto it
git checkout -b Melsteroni-master master
git pull https://github.com/Melsteroni/ohiprep.git master
# CONFLICT (modify/delete): Global/NCEAS-Regions_v2014/ingest_checks.R 
#   deleted in e593aa10b875e6ac42740040aface8c9e974c762 and modified in HEAD. 
#   Version HEAD of Global/NCEAS-Regions_v2014/ingest_checks.R left in tree.
# Automatic merge failed; fix conflicts and then commit the result.

# make changes (for deleted files, simply `git add` to keep)
git add Global/NCEAS-Regions_v2014/ingest_checks.R

# commit, checkout master, merge updated branch, and push to remote
git commit
git checkout master
git merge Melsteroni-master
git push

Issues

• ohicore milestones on HuBoard - excellent overview

  • HuBoard customizations

  • Kanban six core practices

  • maintain ordering by editing order in top comment of issue:

    <!---
    @huboard:{"order":0.01,"custom_state":""}
    -->
    

• GitHub Issues 2.0: The Next Generation - lots of useful tips, including keyboard shortcuts

• GitHub Mention @somebody. They're notified.

  including @user in issue comments notifies that person and subscribes to future updates.

• Trying to enable creation of issues via email alone:

  • Connect GitHub to Email via IFTTT doesn't seem to work based on my recipe: Send [email protected] an email tagged #ohicoreIssue from [email protected].

• Closing Issues Across Repositories

  Now you can include "fixes user/repo#45" in your commit message, and it will close the referenced issue, provided you have the permission to push to that repository.

• GitHub Issues API

  curl -i -u bbest https://api.github.com/issues

• github-issues-import - this Python script allows you to import issues and pull requests from one repository to another

• gissues - GitHub Issues

• GitHub: Merging Repos, Migrating Issues

• tutorial: Team Collaboration With GitHub

Styling

• Emoji cheat sheet for Campfire and GitHub
• Say Hello to Octicons
  • Icon Fonts are Awesome
  • Icons · Styleguide

Markdown

• Mastering Markdown · GitHub Guides

Reproducible Science

• A review paper describing how git can be used to improve reproducibility in science