conflict resolution
Opened this issue · 0 comments
hwick commented
not everyone gets a merge conflict resolution message on GHD. I think this depends on how the conflict is resolved (local kept vs remote kept vs both) -- may want to investigate and have a note in case this comes up during the lesson