Sep 8, 2018 · 1 min read
My bad, I didn’t see that you’d mentioned that as well — I thought the former approach was just the general strategy you were recommending for all PRs. I definitely get that not everyone is going to be comfortable resolving conflicts with Git from the beginning (it’s actually an area where a lot of Devs mess up in my experience) and in that case it totally makes sense for the reviewer or another more experienced developer to come over and walk them through the steps so that they can begin to do it on their own.
Apologies for my mistake ☺
