Git Workflow

September 16, 2015

Meeting Info

Technical: “Git Workflow”

Aaron T. Anderson

Git is version control software best understood in by using it in the context of a workflow for collaborating on a code base. Attendees will get a better understanding of git by looking at the theoretical workflow, a practical example, and how to recover from a conflict.

Last meeting’s fixed example: Git tutorial – “add new post”

External Resources (in order of complexity):

  1. Try git live in your browser - great tutorial!
  2. Git Reference - favorite reference
  3. Git Cheatsheet
  4. Simple workflow
  5. Collaborating workflow

THW Community resources:

Lightning Research Talk: “Error Catastrophe — HIV like melting ice”

Gregory R. Hart

HIV is a rapidly evolving virus which makes it difficult to treat or cure. By drawing comparisons between between the viral quasispecies and statistical physics we can calculate the “thermodynamic” properties of the virus, finding a “phase transition”. This phase transition is reveals novel drug treats and new treatment strategies.

Prez Tip #2

Git + LaTeX

LaTeX is a popular typesetting system in academia because it’s focus on the simple construction of mathematical formulas. Since LaTeX is like any other coding language, it is well suited to be tracked by git.

List of (suggested) branches:

When someone suggests edits, create a new branch (or update advisor branch) and save two versions of the paper, e.g. paper.tex and paper_advisor.tex, then run latexdiff:

$ latexdiff paper.tex paper_advisor.tex > paper_advisor_highlighted.tex
$ pdflatex paper_advisor_highlighted.tex

The pdflatex command will output a marked-up version of the paper (removed words = crossed out red; added words = blue and underlined squiggle).

More tips and suggestions can be found on the StackOverflow question titled “Git + LaTeX workflow”.




comments powered by Disqus