Mona & Grace: solve the merge conflict locally and push your own version. Monat & Grace: commit your own changes (don't push yet!)ĥ. Mona & Grace: edit `README.md` locally on your machine **in the same line** (edit it differently!)ģ. Mona or Grace: edit `README.md` **on GitHub** in a certain lineĢ. you need to solve merge conflicts on your machine -> decide which version / changes you keep your coworker has changed something that clashes with your changes > Merge conflicts occur when competing changes are made to the same line of a file, or when one person edits a file and another person deletes the same file.
#Pop stash gitkraken code#
if things are really messed up: save your code somewhere else and clone again as long nothing is pushed, all is (kind of) ok -> don't push if things are messed up!Ģ. !(././images/other/git_workflow_with_github_with_solution.png) !(././images/other/git_workflow_with_github_without_solution.png) Git Push: "upload" the commits you made locally to GitHub / GitLab Git Pull: "download" new commits from GitHub / GitLab !(././images/gitkraken/gitkraken_remote_lokal.png) **remote**: in the Cloud (GitHub, GitLab. !(././images/other/git_workflow_lokal_with_solution.png) !(././images/other/git_workflow_lokal_without_solution.png) write a (at least partly) informative "commit message" **GIT ADD** the "unstaged files" you want to commit / "save in Git"ģ. `xaringan::inf_mr()` with `index.Rmd` openġ. package to make RMarkdown presentations and *render* them to good looking documents! R *flavour* of Markdown (a markup language) `fast forward master to origin/master` (commit at top) !(././images/gitkraken/gitkraken_commits.png)ģ. Git committing is an operation that acts upon a collection of files and directories. > A commit is the Git equivalent of a "save". # Hands On 1.1: connect Gitkraken with GitHub
#Pop stash gitkraken password#
advantage: only set up once, no need to remember password public key, private key cryptography (siehe z.B. with a *keypair* (`id_rsa.pub` and `id_rsa`) Command line: possibly need to enter username + password > influences how GitHub *authenticates* you go to Settings->Collaborators and add Grace as a collaborator `/git-our-shit-together-test-repo` opensģ. After you clone, you can add and edit files and then push and pull updates.
> Cloning a repository syncs it to your local machine. Forking a repository allows you to freely experiment with changes without affecting the original project.
It allows you to save versions of your code, which you can access when needed. > A Git repository is a virtual storage of your project. RMarkdown presentation (more on this later!) !(././images/github/gracehoppertocat.jpg) # Slides, installation and account creation volunteer at CorrelAid: IT infrastructure, internal projects (R packages), miscellaneous mischief
#Pop stash gitkraken software#
data scientist / IT consultant / software developer at codecentric # alternative title: Let's git our sh*t together! Class: center, middle, inverse, title-slide