page-header

Tag: linux

04
Oct

Git: Merging Conflicts Visually

When using git, I much prefer using the command line as opposed to any GUI applications. However, a problem arises when merging conflicts between the local branch and the remote. Looking at the file and doing it manually can be…

19
Aug

I Forgot My Newline

This is a friendly reminder to always leave a blank line at the end of your text files. You might be thinking that it doesn’t really matter, and in many cases you’d probably be correct. However, there are also plenty…