page-header

Tag: command-line

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…