Collaboration problem
In #2 I alluded to a collaboration problem that I explain here. In this issue we can discuss how to solve this best.
The problem that now arose is that @Johannes-Hoelzel has been working on improving the 3D printer while @mikelovic moved the files to a new directory in the main branch. Since CAD files are binary files, it is difficult to resolve conflicts so unfortunately we require a bit more coordination in this type of repo.
I propose that any work is coordinated by making a new issue on this repository, directing the issue to the people that are relevant. Who is relevant can be extracted from the git history. For example, who has been the one merging into main is always a good person to target and discuss with. In the issue, we can discuss the work that should be done and if we decided on that, we can create a merge request on this website, create a topic branch for the work to be done. After we've done the work associated with this topic branch, we can mark the merge request as being done and ask to merge it into the main branch.
So, in short:
- create an issue and discuss
- create a merge request with a topic branch
- perform the work on the topic branch
- ask to merge the work into main
In this spirit, I will try to propose a solution to make sure that @Johannes-Hoelzel's work can be merged in that I will discuss below.