My training repository
Continuing test of pushing and pulling from Rstudio. What happens when we edit different lines at the same time?
Peter has kindly invited me to edit this readme file. Colette is very welcome to work on this project!
It's fun to work on a common project from two different locations - Johannes is also helping!
This is the easy of git when collaborating on joint projects.
Now let's move to the next phase and create conflicts to resolve them. Why would we intentionally make conflict? Yes - that is when things become really interesting - and I wonder how often it actually happens. Now we'll test what happens when Colette is a push behind.
This is a very interesting comment on collaboration with git.