Lab 4 - Merge Conflicts - Ethics

Lab

Important

This lab is due October 12th at 11:59pm.

Learning Goals

Collaborating on GitHub and resolving merge conflicts
Critiquing visualizations that misrepresent data
Improving data visualizations to better convey the right message

Why Teams: Rationale

In the real world, data scientists and statisticians often work in research teams. It is a skill to be able to communicate and work together on common projects. Thus, the remaining labs + your project will be team based.

Teams work better when members have a common understanding of the team’s goals and expectations for collaboration. The purpose of this activity is to help your team making a plan for working together during lab and outside of the scheduled lab time.

Each team member will have some ideas about how a team should operate. These ideas may be very different. This is your opportunity to share your thoughts and ideas to promote optimal team function and prevent misunderstandings in the future.

Team Name

Discuss with your group a team name to be called. Your GitHub repos will be created for this team name moving forward. Report your team name to your Lab Leader before moving on.

Instructions

Discuss each of the items below with all in-person team members.

Have one person act as the recorder and type the team’s decisions in this document.

Be sure the team agrees on an item before it is added to the document.

Once the document is complete, the recorder should render, commit, and push the team agreement to GitHub. All team members can refer to this lab document throughout the semester.

Team Agreement

Weekly meetings

Identify a 1 - 2 hour weekly block outside of lab where the team can meet to work on assignments. All team members should block off this time on their calendar in case the group needs to meet to finish lab or work on the project.

Meeting “location”

How the team will meet to work together (e.g. in-person, Zoom, Facetime, Google Hangouts). Be sure every member is able to access the virtual meeting space, if needed. If you are unable to find a weekly time when the team can meet, briefly outline a plan to work on assignments outside of lab. Otherwise, you can delete this item.

Primary method of communication

The team’s primary method of communication outside of meetings (e.g. Slack, text messages, etc.)

How should someone notify the other members if they are unable to attend lab or a scheduled team meeting?

By when should everyone have their portion of the lab completed?

Keep in mind your team may want to have time to review the lab before turning it in to make sure it is a cohesive write up.

Any other items the team would like to discuss or plan.

Missing Teammates

If you are missing teammates for today’s lab, it is your responsibility to reach out, say hello, and communicate with them that they must contribute to the above and below questions before submitting lab-04 to Gradescope. You can find their email in the teams repo. The link to the teams repo is located on our website on the teaching team tab.

Resolving merge conflicts

Working in teams includes using a shared GitHub repo for labs and projects. Sometimes things will go swimmingly, and sometimes you’ll run into merge conflicts.

When you and your teammates work on the lines of code within a document, and both try to push your changes, you will run into issues. Merge conflicts happen when you merge branches that have competing renders, and Git needs your help to decide which changes to incorporate in the final merge.

Our first task today is to walk you through a merge conflict!

If you haven’t yet done so since filling out the Team Agreement, now is a good time to render, commit, and push. Make sure that you render and push all changed documents and your Git pane is completely empty before proceeding.

Pushing to a repo replaces the code on GitHub with the code you have on your computer.
If a collaborator has made a change to your repo on GitHub that you haven’t incorporated into your local work, GitHub will stop you from pushing to the repo because this could overwrite your collaborator’s work!
So you need to explicitly “merge” your collaborator’s work before you can push.
If your and your collaborator’s changes are in different files or in different parts of the same file, git merges the work for you automatically when you *pull*.
If you both changed the same part of a file, git will produce a **merge conflict** because it doesn’t know how which change you want to keep and which change you want to overwrite.

Git will put conflict markers in your code that look like:

<<<<<<< HEAD 

See also: [dplyr documentation](https://dplyr.tidyverse.org/)   

======= 

See also [ggplot2 documentation](https://ggplot2.tidyverse.org/)  

>>>>>>> some1alpha2numeric3string4

The ===s separate your changes (top) from their changes (bottom).

Note that on top you see the word HEAD, which indicates that these are your changes.

And at the bottom you see some1alpha2numeric3string4 (well, it probably looks more like 28e7b2ceb39972085a0860892062810fb812a08f).

This is the hash (a unique identifier) of the render your collaborator made with the conflicting change.

Your job is to reconcile the changes: edit the file so that it incorporates the best of both versions and delete the <<<, ===, and >>> lines. Then you can stage and render the result.

Merge conflict activity

Setup

Clone the repo and open the .qmd file.
Assign the numbers 1, 2, 3, and 4 to each of the team members. If your team has fewer than 4 people, some people will need to have multiple numbers. If your team has more than 4 people, some people will need to share some numbers.

Let’s cause a merge conflict!

Our goal is to see two different types of merges: first we’ll see a type of merge that git can’t figure out on its own how to do on its own (a merge conflict) and requires human intervention, then another type of where that git can figure out how to do without human intervention.

Doing this will require some tight choreography, so pay attention!

Take turns in completing the exercise, only one member at a time. Others should just watch, not doing anything on their own projects (this includes not even pulling changes!) until they are instructed to. If you feel like you won’t be able to resist the urge to touch your computer when it’s not your turn, we recommend putting your hands in your pockets or sitting on them!

Before starting: everyone should have the repo cloned and know which role number(s) they are.

Role 1:

Change the team name to your actual team name.
render, commit, push.

🛑 Make sure the previous role has finished before moving on to the next step.

Role 2:

Change the team name to some other word.
Render, commit, push. You should get an error.
Pull. Take a look at the document with the merge conflict.
Clear the merge conflict by editing the document to choose the correct/preferred change.
Render.
Click the Stage checkbox for all files in your Git tab. Make sure they all have check marks, not filled-in boxes.
commit and push.

🛑 Make sure the previous role has finished before moving on to the next step.

Role 3:

Change the a label of the first code chunk
Render, commit, push. You should get an error.
Pull. No merge conflicts should occur, but you should see a message about merging.
Now push.

🛑 Make sure the previous role has finished before moving on to the next step.

Role 4:

Change the label of the first code chunk to something other than previous role did.
Render, commit, push. You should get an error.
Pull. Take a look at the document with the merge conflict. Clear the merge conflict by choosing the correct/preferred change. render, and push.

🛑 Make sure the previous role has finished before moving on to the next step.

Everyone: Pull, and observe the changes in your document.

Tips for collaborating via GitHub

Always pull first before you start working.
Resolve a merge conflict (render and push) before continuing your work. Never do new work while resolving a merge conflict.
Render, commit, and push often to minimize merge conflicts and/or to make merge conflicts easier to resolve.
If you find yourself in a situation that is difficult to resolve, ask questions ASAP. Don’t let it linger and get bigger.

Conveying the right message through visualization

Packages

We’ll use the tidyverse package for much of the data wrangling and visualization.

library(tidyverse)

Since the exercises for this week are short it’s possible not every team member will get to commit and push during the workshop. However each team member should review what was created, fix typos, make edits for better presentation, etc. either during or after the workshop, and before the deadline.

Note: Everyone should intellectually contribute to every question. However, no two teammates should work on the same question at the same time below.

Data

In this lab you’ll construct the data set!

Exercises

The following visualization was shared on Twitter as “extraordinary misleading”.