Module 3 Exercise 2: Merge conflicts


(Vanessa) #1

Exercise: Pull requests and merge conflicts

  1. Accept the group assignment, join a team with other members in it, and gain access to a shared repository.
  2. From the shared repository on GitHub.com, clone the repository down to your local machine.
  3. Edit the “Group Assignment” markdown file in your text editor.
  4. Save it out, stage the changes and push to the Module 3 repository.
  5. Resolve any merge conflicts that arise.

Post a screenshot of your pull request to a group project here.


(Clara) #2

Does it matter which team we join? Thanks!


(Vanessa) #3

@minneapolis-edu feel free to join a team, or start your own.


(Richard) #4

I know you didn’t ask for a screenshot, but I’ve gotten used to it now :stuck_out_tongue:


(François Roland) #5


(Mike Crabb) #6


(Vanessa) #7

@barnsza :sparkles:


(Omal Perera) #8


(Derek Land) #9

no merging… no conflicts…


(Miren Berasategi) #10

Oh well. Did not join any team, so no pull request, no conflicts, no merge.


(Vanessa) #11

Did you want to join an existing team? I see Mod3team has a few members:


(Paola Corrales) #12

Here is the screenshot! No merge conflict this time :thinking:


(Ricardo Martin Marcucci) #13

Here my screenshot, no merge conflict.


(Vitor Rios) #14

In the repository with the videos, there should be a mention that the group assignment is in this thread :wink:


(Tess Homan) #15


(Alexander L. Hayes) #16

Adding my screenshot for the team activity!


(Vicente Cubells) #17

Module 3 Exercise 2


(Mark Patterson) #18

I’m not quite sure what you’re looking for with this exercise. Like a lot of people, I created my own team before realising that really I needed to be in a team with other people in it, so to create the possibility of merge conflicts. So I used git commit --amend to create my own merge conflict. As follows:

vi GroupAssignment.md
git add GroupAssigment.md
git commit
git push origin master
vi GroupAssignment.md
git add GroupAssigment.md
git commit --amend
git push origin master

git push origin master fails, because local is out of sync with origin. So…

git pull origin master

This throws a merge conflict, so have to edit GroupAssignment.md to fix the conflict.

vi GroupAssignment.md

Then commit and push

git add GroupAssigment.md
git commit
git push origin master

Tada.

And since everyone’s including screenshots…


(Danny de Vries) #19


(Joachim Francois) #20

@mozzadrella I forced a little merge conflict by updating the groupassignment.md in a seperate branch locally and updating the same in the master branch before making the pull request.
That seemed to do the trick :slight_smile:

image