# RSH 022: Git conflicts Notes are now at https://hackmd.io/@researchsoftwarehour/questions