I’m working on a small project with two other developers. Our work is on Gitlab. Our general workflow is that we create feature branches by branching off
development which get merged back into
development after review by one of the other team members.
Recently, the other two team members were on holiday for several weeks simultaneously which meant that I could not merge into
development. However, the first change on my list was an internal API change (on the branch
new-api) that would affect all other work. Obviously, I didn’t want to base the rest of the work on the old API only to adapt it to the new one once it was reviewed and merged. So I created my feature branches off the head of the
new-api branch. I then pushed my branches to Gitlab, as I wanted my team members to see my work during my holidays.
The problem is that the history now shows the unusual branching. Would there have been a cleaner way of organizing this?