RSH 22: resolving git conflicts

Git conflict resolution strategies

Video

Collaborative notes taken during the session

Git conflicts

Session outline

Questions/comments