A repository for the Moab Use-R! group

When you add files, edit files, or delete files the workflow will always be:

1. Commit the change, with a message
2. Pull changes from the remote server
3. Push changes to the remote server

The Git Desktop GUI combines the Pull and Push steps into one single "Sync" button.

If you have a merge conflict, the offending files will have edits that highlight ("Conflict Markers") where two versions of the same file diverge e.g.

<<<<<<< HEAD
data <- read.csv(...)
=======
my_Data <- read.csv(...)
>>>>>>> cb1abc6bd98cfc84317f8aa95a7662815417802d

• HEAD = YOUR version of the file
• The long hexadecimal string (i.e. "cb1abc6bd98cfc84317f8aa95a7662815417802d") is the version of the file on the Remote Server; this string itself is the unique identifier of the commit
• In order to resolve the conflict and successfully merge the versions of the file, you must remove all of the lines with angled brackets (e.g. <<<< HEAD, >>>>), the line with the equals sign (=====), and the line of code you don't want to save.
  • Alternatively, you can combine the code between the two versions if that makes sense to do so.
  • You just need to remove the "Conflict Markers" before completing the merge
• After you remove those conflict markers, you can continue the merging process