@@ -19,8 +19,8 @@ This week's research mainly consisted of learning these tools using the tutorial
## Setting up the SSH key
Tried to rush it and left the default email in by accident. Whoops!
Deleted the key and generated a new one with the terminal commands provided here and popped it into the settings in Gitlab
[Generating an SSH key] (https://gitlab.fabcloud.org/help/ssh/README#generating-a-new-ssh-key-pair)*
Deleted the key and generated a new one with the terminal commands provided and popped it into the settings in Gitlab, using this tutorial for
[generating an SSH key] (https://gitlab.fabcloud.org/help/ssh/README#generating-a-new-ssh-key-pair)
Also Fiore's tutorial has been very helpful here:
-[Fiore's tutorial](https://vimeo.com/253336757)
...
...
@@ -80,7 +80,7 @@ You need to fetch the URL provided in the back-end of the project using the SSH
[Github Desktop app](https://desktop.github.com/) to commit and push to git locally, bypassing the browser (using SSH), and here you can find [MacDown](https://macdown.uranusjr.com/), the markdown editor.
### How it works
It's pretty straightforward, you go find the files locally and them edit them with an editor. And it tells you whether you have any commits that need pulling (when changes were made somewhere else) or pushing (when you make changes locally but haven't updated the master repository yet). Nice and easy! I also loved learning Mercurial on the command line though (forever grateful @Zaerc) I'm used to Brackets from back when I did Fabacademy. [Oh sweet memories from 2015](https://fabacademy.org/archives/2015/eu/students/bogers.loes/finalproject.html)
It's pretty straightforward, you go find the files locally and them edit them with an editor. And it tells you whether you have any commits that need pulling (when changes were made somewhere else) or pushing (when you make changes locally but haven't updated the master repository yet). Nice and easy! I also loved learning Mercurial on the command line though (forever grateful @Zaerc) I'm used to Brackets from back when I did Fabacademy. [Oh sweet memories from 2015.](https://fabacademy.org/archives/2015/eu/students/bogers.loes/finalproject.html)
But for another project I'll be using MacDown, which gives a nice simultaneous preview! Pretty nice too. Let's see which one I'll end up using.
...
...
@@ -101,7 +101,7 @@ Yes! I had my first conflicting commit between the remote repository and my loca
Then you keep the code you want to keep, delete the conflicting code plus the marker and save the file. [This support page](https://help.github.com/en/articles/resolving-a-merge-conflict-on-github) was helpful. The desktop app recognizes when the conflict is solved and allows you to commit again. Yay!
Then you keep the code you want to keep, delete the conflicting code and the markers and save the file. [This support page](https://help.github.com/en/articles/resolving-a-merge-conflict-on-github) was helpful. The desktop app recognizes when the conflict is solved and allows you to commit again. Yay!
