@@ -90,6 +90,20 @@ I really prefer to work with my content offline actually, particularly images. I
I really prefer to work with my content offline actually, particularly images. I remember now that images need to be compressed to no more than 100kb, so I have to do that even for a screenshot. I use Photoshop for this and export for web. Which is fine, but it's quite some file hassle because I always forget and then I have to go back in and do it later. It's nicer to do that all locally and commit using the desktop app. At first my images didn't show up at all. I'm wondering if the makers of the templates put a limiter on large images? That would be so clever.
## Updating the info on the index page
## My first conflict
Yes! I had my first conflicting commit between the remote repository and my local one. How do I resolve this.... on the Github Desktop app you get an error when you want to commit a change that conflicts. Then you can click to open the file. It adds these conflict markers so you can see exactly where the problems are:
Then you keep the code you want to keep, delete the conflicting code plus the marker and save the file. The desktop app recognizes when the conflict is solved and allows you to commit again. Yay!
