Dealing with Merge Conflicts

Step 0: Everyone: Come up with a team name.

Step 1: Everyone: Clone your project repo in from the course GitHub website and open the R Markdown file called project-proposal.Rmd.

Step 2: Assign the numbers 1 and 2 to each of the team members. If applicable, assign the number 3 to the third member.

Step 3: Take turns in completing the steps below exactly as written, only one member at a time:

• Member 1: Change the team name to something different from your team name. Knit, commit, and push.

• Member 2: Change the team name to your team name. Knit, commit, push. You will get an error, and be asked to Fetch changes. Show the error to your partner.

  • Fetch the conflicts. Next to the project_proposal.Rmd file, click “Open in RStudio”. Review the document with the merge conflict. Show the document with the conflicts to your partner.
    • A merge conflict occurred because you edited the same part of the document as Member 1. Resolve the conflict with whichever name you want to keep.
  • Knit, commit and push. You should have no issues pushing now!

• Member 1 (or Member 3, if team of three): Change the date to the date the proposal is due (11/18/2022).

  • Knit, commit, push. You will get an error. Read it, show the error to your partner.
  • Pull the new changes. No merge conflicts should occur, since you edited a different part of the document from Member 2.
  • Knit, commit, and push.

Step 4: All members: Pull, and observe the changes in your document.