FreeShow git question

[zabackary]

This isn't a support question, but I'm just wondering something:

Is the dev branch the development (i.e., not feature) branch for the FreeShow repo? If so, is there a reason that after every release merge from dev to main, the dev branch is deleted deleting all commits created in it? It's making debugging a change hard for me because I think the commit that caused the regression was squashed and merged into main, then dev was deleted, then dev was recreated from main with the squashed commit but without the original commit.

Apologies if I'm misunderstanding something here.

[vassbo]

The dev branch is used for the development all other branches are merged into the dev branch first, then on every release dev is merged into main. The reason it's deleted is to get the dev branch up do date with the main branch, I did not delete it at first, but then I always got merge conflicts when I merged into main again.

[zabackary]

Oh, I see. That clears things up for me.

I'm curious why there are merge conflicts though since it seems like git should be smart enough to resolve it if main hasn't been commited too in the meantime.

[vassbo]

I would have thought that as well, maybe I'm doing something wrong. I do not understand why, but this works for now.