Closed arnopauwels closed 3 weeks ago
The conflict is fixed, so now you should be able to merge. Once you've done it, don't forget to pull the changes in RStudio while you're on the 314 branch to bring the files on your laptop up to date.
Thanks Axel, everything worked fine!
The conflict is fixed, so now you should be able to merge. Once you've done it, don't forget to pull the changes in RStudio while you're on the 314 branch to bring the files on your laptop up to date.