This repo was the result of an Rstudio workshop I took hosted by Jenny. It focused on using compsci best practises in R coding (for those self taught). There was a whole day devoted to just using Git. This is my result from that workshop
Line added locally
Another line added from the github browser
Local commit - trying to create merge conflict