Made changes to a group project.
I confess that I am really confused by Module 3. The assignment numbers don’t seem to match the assignments in the doc (the header of this thread is 3-2 but it has the text of 3-4 in the readme). I can’t find teams with other users to join, and the assignment seems to tell me to push my changes to the Group Assignment file (which I did) then at the bottom it asks me to post a screenshot of a ‘pull request’ which it did not ask me to create. There are no merge conflicts. Help?
Here is the solution for Module 3 Exercise 2. Here are the screenshots for two branches that I see that they are merged successfully after my pull request
Thank you for your slide and exercise.
I simulated two students (Rafael and Jose) committing their information to the GroupAssignment.md file to force a conflict. Rafael and Jose cloned the same branch’s repository but Rafael has pushed his changes before Jose.
@mozzadrella, i seem to have made a mistake. instead of joining a team, I created a new one. Hence no Merge conflict. But I did simulate one locally.
No conflicts on remote:
At first I was jumping into the assignment too quickly and forgot that it’s about creating a habit with pull requests… So I just updated the .md on master. Gave it a second try afterwards.