# Technical training MetOs@UiO Day 2: individual git
- Lesson [webpage](https://coderefinery.github.io/git-intro/)

## :shaved_ice: Icebreaker question

My favorite programming language(s) is(are):
- Write answer here l

## Introduction to version control with Git
- Write your questions here

:::info
*Always ask questions at the very bottom of this document, right above this. Switch to view mode if you are only watching.*

*We are monitoring this hackMD, but we will reply every now and then so that you can focus on the speaker.*
:::

## Discussion:
- 1
- 2 +4 ++++++
- 3
- 4 ++++1+
- 5

## Questions:
- Is there any difference in using atom or emacs?
- Both editors are totally fine to use. The keys and commands to use in each editor is different so it is better to chose one and stick to it. But, it is your choice!
- Even vim, or notepad, doesn't matter, whatever you are more familiar with ;)

- when in Git Bash on Windows, does the command alias stay active over multiple sessions, or just the current one?
- Most likely not

- How to save files in emacs or exit emacs (on comand line)?
- CTRL +s +x (opens save dialog), possibly CMD+s+x if on MacOS(?)
- CTRL +x +s (saves the file)
- CTRL +x +c (closes emacs)

- What does this warning message "warning: LF will be replaced by CRLF in ingredients.txt." when staging changes (add) mean?
- It means that git repositories use the Unix end of line symbol instead of the Windows one (text files and ASCII).

- Why are branches still there after merging?
- You have to explicitly delete the branches you do not need anymore.

- Fast-forward merging not possible => How to solve merge conflicts?
- If a file has been changed simultanously you will get this "problem".
- check the status by typing git status and open the file(s) in conflict
- Decide on the changes you want to keep
- Save, add and commit the file

- has anyone succeeded with the visual diff tools on Windows?(https://coderefinery.github.io/installation/difftools/)
- Yes, but only because I had a different third party tool installed from before (tortoisemerge). It depends on you setting up third party software.

- How is a conflict defined?
- Some change(s), typically developed in two different branches, that touches the same part of the code in the moment of a merge.

------------------

### Assigning themself to breakout room or sharing screen
Check your version of zoom:
Prerequisites
Breakout rooms enabled
Zoom desktop client, or web client
Windows: 3.5.31087.1102 or higher
macOS: 3.5.31087.1102 or higher
Linux: 2.0.81497.1116 or higher
Chrome: 2.4.943.510 or higher
Self-select breakout rooms:
Desktop client or mobile app: version 5.3.0 or higher.
ChromeOS: version 5.0.0 (4241.1207) or higher

:::danger
If you're not editing this hackmd document, please go to view mode by clicking the eye button :eye: - you can then go back to edit mode when you want to edit.
:::