Integrating Code & Resolving Conflicts
Learn to fix problems when your code overlaps or conflicts with others’
Activities
As a Team
- Continue using the standup format to check in at your team meetings:
- What have I been working on so far this week?
- What will I be working on (or continuing) next?
- What issues are blocking me?
- Talk about the experience of using the Git workflow, and seek clarification from your Project Lead on anything that went wrong.
- Learn to resolve any merge conflicts that came up when adding names to the ReadMe; you’ll need to do this throughout your project
- Each person should assign themself to at least one ticket, and move it to the “In Progress” column.
On Your Own
- Work on your ticket(s) independently outside of your meeting
- When you’re done with your ticket and ready to push in your code, you’ll follow the same process as you did for editing the ReadMe, but this time you will be expected to resolve any merge conflicts before making your Pull Request.
Resources
- Video: Resolving Merge Conflicts (John McGarvey, Code the Dream)
- Video: What is Continuous Integration? (IBM Cloud)
