Add additional challenge for git conflicts

[jcamins]

We talk about git helping resolve conflicts when two or more people make changes, but don't really ask students to think about the issue of more than two people making changes. So I added a challenge that would ask the student to try a three-way conflict.

[fmichonneau]

It seems like an interesting and worthwhile addition. I have never taught git but I'm a little concerned that it might take a while to complete the exercise for people who are brand new to git. Not necessarily because the task is complicated but because of the logistics it involves. It might be easier if it's done as a demonstration by the instructor.

[jcamins]

@fmichonneau The content that is already in the git lesson takes up all the time allotted for the git section, so I was thinking that this sort of challenge would make for good additional reinforcement if a workshop makes particularly good time, or if someone is reading on ahead.

[jiffyclub]

I've been using Git for years and honestly it took me a bit of thought to figure out where this challenge is trying to lead the students. I'm -1 on adding this since the situation described is rare and the actual exercise is kind of redundant.

[jcamins]

@jiffyclub Interesting. I've encountered this situation a number of times, so I just assumed that it was common.

[ethanwhite]

I'm with @jiffyclub on this. I've never run into this personally and it adds a level of complexity with getting groups of 3 interacting just for this exercise.

[jcamins]

I'm happy to close this if there's a consensus that this isn't a situation that comes up frequently. I wrote the challenge after running into this situation and needing to explain that "yes, git works with more than two developers working on a single section, too" (though, of course, changes have to be merged pair-wise).

[jiffyclub]

Okay, I think we're in agreement that the novice lessons aren't a good place for this. I'll close this, thanks for the suggestion!