I have Dev, Stage and Prod branches but due to my tools, I have to commit configurations onto Stage and Prod when deploying.

Dev --> Staging (Jan 1st)

Staging <-- release branch

Staging --> Prod

Prod <-- release branch

Prod --> Dev

After that cycle I begin having all kinds of git conflicts and even when resolved, git keeps trying to replay the entire history starting on Jan 1st history. I've tried rebasing and still have issues. What am I missing here?

Thanks!