GIT in PyCharm or IntelliJ

XKE - 04-16

• Short git intro and IntelliJ / PyCharm.
• Various scenarios: command-line vs UI.
• DIY: view changes, commit parts, solve merge conflict(s), squeeze-commits (rebase), compare branches.
• Q/A

Intro to Git:

Learning links:

• git-guide (no deep shit, easy read)
• www.atlassian.com/git
• merge-vs-rebasing (atlassian)
• try.github.io
• online git game

Command-line vs IntelliJ

1. Add an hello-world example in any language.
2. Add a joke into the conflictspace using a branch
3. Add and re-rank some movies to make the must see list more complete.
4. In conflictspace, refactor something (small) in the 'bijtelling calculator'
5. Now change the commit message, into something better for all these commits