2019-02-13 FEB

Codacy visiting next week. Provides automated code reviews according to best practices and can link to Github.
Benefits of Github
- CDN - Content Delivery Network
- Private Repos are now free.
- Tiered structure enables larger repos
- Webhooks for third-party software integration (e.g. codacy)
- All revisions can be pulled via Github's RESTful API
Git GUI (Graphic User Interface) Applications. First, grant authorization through Github for each application to connect to your GitHub repo. All of these applications also work with offline repos.
- GitHub Desktop by Github
- Sourcetree by Atlassian
- GitKraken by Axosoft
Git functionalities from a GUI (Kraken) point of view
- Staging (git add)
- Committing (git commit -m)
- Reverting (several git commands; GUI recommended)
- Stashing and Popping (git stash) - Temporarily save (stash) / revert (pop) your changes from the last commit. (Committing will clear all stashes.)
  - More on "stashing" and "popping": https://abdulapopoola.com/2014/06/05/i-git-stashing-explained/
Resolving a merge conflict (Erika)
- Workflow summary:
  - git pull -> discover merge conflict -> git status -> edit conflicted file(s) in text editor -> go to conflict markers -> manually decide what to keep/remove -> remove conflict markers -> commit -> push back to remote repo
- Reference docs:
  - https://help.github.com/articles/resolving-a-merge-conflict-on-github/
  - https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
- The actual commit:
  - https://github.com/web4bio/webgen/commit/668aa418d2b3d6eab131972078975b1ccac8c130
Joe's advice re:
- ... avoiding merge conflicts:
  - workflow: coffee -> email -> pull -> work -> push
  - advice for webgen project: branch -> make edits/commits -> and then merge back using a visual merge tool
    - this should allow you select which lines to keep and merge in the case of a merge conflict
  - use merge tools: VIM, github desktop
- ... github as your résumé:
  - "live papers"
  - code snippets
Editors -
- Vim/EMacs/Pico/Nano (pre-1995) - non-gui & non-mouse, so need to remember keyboard shortcuts - helpful to know basics for command-line only text editing
- Notepad++ (2003) - Windows only
- Sublime Text (2008) - fast, but costs $80/license/user. Trial version is free to use and untimed (license msg pop-up every 7 or so saves).
- Atom (2014) - free alternative to Sublime Text, JS/electron app
- Visual Studio Code (VS Code) (2015) - started from MS engineers who were prohibited from using Sublime or Atom. Joe recommends VS Code (JS/electron app).
- Comparison of the leading text editors: https://stackshare.io/stackups/atom-vs-sublime-text-vs-visual-studio-code
Demo of VS Code Extensions
- "Live Share" - multi-user collaboration
- "Prettier" - auto-indents HTML
- JSON PrettyPrint - reformats JSON file
- Git Lens
- Live Server

Report abuse