Skip to content

Latest commit

 

History

History
146 lines (115 loc) · 10.1 KB

README.md

File metadata and controls

146 lines (115 loc) · 10.1 KB
Raw

GitHub/git tutorial

Workshop scratch area for demo purposes

Version control with Git

-> GitHub is a code hosting platform for version control and collaboration based on git. GitHub allow you to do (more) visually what git can do from the termnal (merging branch, diff, blames, insights, logs, history).

-> Git is a version control system:

Remember those 3 concepts, the first one is required for the following ones to exist:

  1. versioning files means tracking/tagging and persisting history of file (incremental) changes
  2. restore changes back from the past (commits hash!)
  3. merge with changes from other branches/remote
  • Everything is local (95%!), you can work (change/track/merge your files) offline.
  • Distributed, switch repos, fork, etc.
  • Tree, branches and checkpoints git commit && git add -u && git push (~ save as): raise a hand whoever, in the past, saved a file appending a suffix -VERSION_TAG to the filename to track the changes? ✋

Pull request workflow, see graph with branches in slides draft or directly here

Tutorial

The idea is that at the end of the workshop you shouldn't be saving your file with different filename everrtytime you want to keep a version of it for the future ;-)

This tutorial will cover:

  • git main commands
  • branches and merging, i.e. if 2 branches, master and dev: branches
  • github tool: graphs/metrics, pull request, code review

Participants will need a github account and be added to the (team) repos write permission to be able to interact with the IPAC repos and Git tool installed locally.

Demo through a Pull Request example

Participants will be guided through the following steps:

git from scratch!

  1. clone the repos locally on their end (need git software installed)
  • git clone https://github.com/Caltech-IPAC/grits2018-github-tutorial.git
  • default landing branch should be dev (default per repos, this one has rules for PRs!)
    • git status -sb to check on which branch you are
  1. Pull request workflow demo with feature/ticket branch from dev
  • Will go through steps 3. to 9. described below (hands-on) very fast here
  • git checkout -b [branch name], required unique branch name, usually formatted as ISSUE-ID-meaningful-short-description
    • for example, let's take a look at epic from JIRA board IRSA-2060 and i've picked a ticket, i.e. IRSA-2062 improve the text
    • Branch name will be IRSA-2062-improve-text, once created, git will switch you to this local branch (see branches git branch -a, see status git status (--long))
  • Will update locally scratch.txt and make it bold
  • Will commit and push the branch
  • Will make a pull request
  • Will show the review aspect of a PR and merge
  • See JIRA ticket back again with reference to branch merged and links. If demo goes bananas, see sample here IRSA-2039

Hands-on: back to you!

  1. Assignment for you: Imagine that you get assigned a ticket to update names.txt with your name
  • clone repos if you didn't do it yet! (see 1.)
  • create a branch, append your github USERNAME to branch name, i.e. git checkout -b EJOLIET-adding-name
  • edit and change the file named names.txt by adding your name, don't remove other names! ;-)
  • commit your changes in your branch: add/commit
    1. git add names.txt
    2. git commit -m"[your message]"

  1. continue changing/adding/commit and check the differences:

    1. git show (git show -2 -p see history diff 2 commits behind)
    2. Check your commit history: git log or more fancy git log --decorate --graph
    3. OPTIONAL: if no commit to be made, at that point, you can: pull or rebase
    • after pulling, check branches pulled: git branch --all
    • if dev got new things, you will need to rebase in order to avoid conflict at the time you pull request
    1. OPTIONAL: git stash very useful to stage changes and switch from one branch to another...

  2. Once done with changes, push to server (-u flag means that you'll start tracking the branch upstream)

  • First time push: git push -u origin [branch name]
  • Your local branch is now synced with remote, someone else can take other or run jenkins ;-)
  • Next pulls/pushes: git push or git pull
  1. Pull Request: in github.com, button 'pull request' should appear
  • Show a pull request / code review
  • OPTIONAL Show a case of how to request changes (and what to do)
    • if request change, need to go to the branch, and
      • change file, git add / commit / (rebase -i to squash) / push (steps 3 to 6 above)
      • no rebase there because branch is already in server / no force push either
  • wait for approve (repo rule in settings)
    • did you update the counter in sum-team.txt and run ./team-test.sh? Jenkins will complain ;-)
  1. Show when approve changes and merge from github
  • Branch can be deleted from github after merged

  1. OPTIONAL: If merge conflict (typically, same line have changed in the meantime): github will suggest commands and guidelines to solve and merge locally. Tipically you'll need to fix the conflict and commit then merge back to dev git merge [branch]

  2. Once merged, typically the branch can be deleted from github from the same pull request page.

Advanced

You want more git?

  • branch merge with --no-ff on tagged branches, otherwise fast-forward no-ff
  • stage changes, git stash, reapply and drop last stash: git stash pop, others command: drop, apply stash{X}
  • create pathch and apply: git diff hash1 hash2 > patch.diff then, apply to different branch, git apply patch.diff
  • rebase what? Rewriting the history! Sometime is colorful... rebase -i to pick and squash!
    • I messed up a branch merged or a commit? revert remote? Rewriting history requires FORCE pushed -f, see this article
    • git reset to change the pointer, git revert to a particular commit, go back in history at your own peril.
  • cherry picking? Is it like going to a picnic?
  • fork? And knives too... a way to contribute to a project even if they don't want you! example
  • git bisect WOW!
  • see your git commands with git reflog
  • cleanup local branches: git branch -d [BRANCH_NAME] (or -D to force delete if branch has changed after remote merged)
    • remote delete: git push origin --delete [BR_NAME]

Github and (admin) advanced tools

Need Help?

guides

useful commands

  • git config aliases and more or use command git config --global --edit my aliases
  • git config --global alias.hist 'log --pretty=format:"%h %ad (%cr) | %s%d [%an]" --graph --date=short'
  • very powerful one: git log --grep
  • Learn more about credentials, clone with username, prompting your password: git clone https://[email protected]/username/repository.git
  • Switch username or endpoint: git remote set-url origin https://[email protected]/Caltech-IPAC/grits2018-github-tutorial.git
  • .gitignore? convenient when git add -u
  • Github blame is awesome but can i do something similar with git? YES:
    • Do search for changes related to a string git log --stat -S"gator.host" --pretty=format:'%h %an %ad %s' .
    • Once you know the file, see diff in each commit, ~blame: git log -p -M --follow --stat -- /path/to/FILE. Ta-da!
  • Resolve conflict with git: git mergetool details

HELP!?