re: Git help: Merging updates in a classroom repo VIEW POST

FULL DISCUSSION
 

So it sounds like you already have a pretty good cli sketched out there!

You have a script that tries up do an merge with upstream.
Then you do a git diff to find only the files with conflicts and loop over them.
Giving the students the option to reset and save a copy, or fix the merge. If they say the fixed it maybe add the file for them

And then once all the files are finished you should be good to merge the final result, potentially giving the students a chance to enter a message!

Any particular bash or git bit that is tripping you up?

 

Not so far! I haven't had time to dig into writing my own script yet. I think this is the approach I'll take -- I just didn't want to dive in without asking around about something that might already do the same :)

code of conduct - report abuse