---
# System prepended metadata

title: 2024-10-22-NCL Version Control with Git
tags: [workshop]

---

# 2024-10-22-NCL Version Control with Git

### This document:

## https://hackmd.io/@rseteam-ncl/2024-10-22-NCL/edit

RSE webpage with future courses: [https://rse.ncldata.dev/events](https://rse.ncldataldev/events)

### JupyterHub:
## http://172.167.248.222/
**We asked for your uni login when you registered. Please use that to login - it is <span style="color:red;">case sensitive</span>. The password you enter the first time you log in will become your password.**

Image for markdown:
![alt text](https://carpentries.github.io/lesson-example/assets/img/cp-logo-blue.svg "Carpentries Logo")

Link to command line lesson: [https://rse.ncldata.dev/events](https://rse.ncldata.dev/events)

**Mentimeter**:  www.menti.com
1271 3438

**Merging two GitHub accounts:**

https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/merging-multiple-personal-accounts

### Exercise
#### Solving Conflicts that You Create
git@github.com:jsteyn/2024-11-22-NCL.git

### Countries repository
https://github.com/jsteyn/countries

<span style="color:red;">Please scroll down to Attendance and write your details. </span>
### Links:
- [Code of Conduct](https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html)
- [Workshop website](https://nclrse-training.github.io/2024-10-22-NCL/)

- [Link to lesson website](https://nclrse-training.github.io/git-ultra-novice/)
- [Pre-workshop survey](https://carpentries.typeform.com/to/wi32rS?slug=2024-10-22-NCL)
- [Post-workshop survey](https://carpentries.typeform.com/to/UgVdRQ?slug=2024-10-22-NCL)
- [Code Community](https://teams.microsoft.com/l/team/19%3aG79Rz7Mhk6rC0mhia04YCD-nj7WabLMxhnyb1YLp04A1%40thread.tacv2/conversations?groupId=7059214c-2200-4ad6-a739-9d350c74c7a9&tenantId=9c5012c9-b616-44c2-a917-66814fbe3e87)

### Attendance:
## Please sign in using your <span style="color:red">university email</span> and your <span style="color:red">name</span>:

### Instructors and Helpers
1. robin.wardle@newcastle.ac.uk, Robin Wardle
2. Alex Surtees
3. Jannetta Steyn
4. Ruxandra Neatu

## Students
