# Technical training@NGI: introduction to version control with git - Lesson [webpage](https://coderefinery.github.io/git-intro/) ## Schedule: - Session 1: - 09.00-09.50: Intro, motivation and basics. - Session 2: - 10.00-10.50: The staging area, branching, tags and merging. - Session 3: - 11.00-11.50: Conflict resolution, sharing repositories, how much git is needed? ## :shaved_ice: Icebreaker question My favorite programming language(s) is(are): - python :snake: :snake: :snake: :snake: :snake: - FORTRAN - R - does Matlab counts? - :laughing: But yes, of course. It is a very much used language in certain communities. For singale processing for instance. ## Guacamole ### I'm done? - :+1: - :+1: - :+1: - :+1: - :+1: ### Discussion: tell a story with the staging area Take 2 minutes to consider which [history](https://coderefinery.github.io/git-intro/04-staging-area/#discussion) which would tell you most about your work when you look at it late. Give a :+1: to the option you prefer: - Example 4 :+1: :+1: - Example 2 :+1: :+1: - 5 It may depend on the week's day... Monday: Example 1, Wednesday 4: Ex. 4, Friday: none - Example 4 it has more details on what is added -VDa ## Staging exercies ### I'm done? - :+1: :+1: :+1: :+1: ## Revert a commit ### I'm done? - :+1: :+1: 1. What happens if you accidentally remove a tracked file with git rm, is it gone forever? - no, - no, - nope 2. Is it OK to modify commits that nobody has seen yet? - well, you can revert, so you could commit 3. What situations would justify to modify the Git history and possibly remove commits? - while double checking? final versions - or only for sensitive information, things related to GDPR or for instance passwords ## Branching and merging Remember to set the alias for graph: git config --global alias.graph "log --all --graph --decorate --oneline" ### Exercise for branch #### I'm done :+1::+1: Add :+1: ## Feedback ### More of this Mention at least one thing you liked about today's workshop: - Good job Sunniva, easy to follow! ### This could be improved Mention at least one thing you think could be improved from today's wotkshop - Write answer here # Questions - Write your questions here - Answers here :::info *Always ask questions at the very bottom of this document, right above this. Switch to view mode if you are only watching.* :::