I was just trying to see if it was easy to edit/comment simultaneously online on github. I guess I was just curious to see how the interface reacted when there are conflicts. Unfortunately there is no merging proposed it just says that someone changed the file since the start of the edition. Not super convenient.
Conclusion for the next time, when we want to have feedback from many people, it still makes sense to share a google doc (or use Hypothesis for comments) and then go through them manually to update the repo. We could also suggest going the PR route if someone feels like they are going to change a lot of text.
I was just trying to see if it was easy to edit/comment simultaneously online on github. I guess I was just curious to see how the interface reacted when there are conflicts. Unfortunately there is no merging proposed it just says that someone changed the file since the start of the edition. Not super convenient.
Conclusion for the next time, when we want to have feedback from many people, it still makes sense to share a google doc (or use Hypothesis for comments) and then go through them manually to update the repo. We could also suggest going the PR route if someone feels like they are going to change a lot of text.