Protect main branch so develop is never behind main

Mesure73L commented 8 months ago

What problem were you having?

The develop branch has commits ahead of (which is fine) and behind (which is NOT fine) the main branch.

What solution would you like?

Don't allow anything to be merged into main without being merged into develop first.

What alternatives have you considered?

Just be smart to avoid conflicts.

What are some pros and cons of doing this?

Pros:

Makes it easier to merge releases
Avoids merge conflicts which will inevitably delay the process
Easier to manage the branches

Cons:

You will have to release everything at once
Might get complicated if multiple things are being worked on at once (could be avoided by using branches for literally everything, as we currently are)
Version control could get a bit more complicated

What page is this for?

Repository

BeepBot99 commented 8 months ago

No, it is fine how it is, because as long as you merge main into develop after you make any commits to main, it will be fine.

Mesure73L commented 8 months ago

But what if you're working on something in develop, like Twelve of Code, so you can't merge main into develop?

BeepBot99 commented 8 months ago

Now, develop is not behind main anymore.

BeepBot99 commented 8 months ago

I don't think you fully understand how Git works. It only merges changes. If you merge main into develop and are working on Twelve of Code, it will not merge main's Twelve of Code because it has not changed.

Mesure73L commented 8 months ago

I don't think you fully understand how Git works.

Nah, really?

It only merges changes. If you merge main into develop and are working on Twelve of Code, it will not merge main's Twelve of Code because it has not changed.

I forgot about that, mb

Mesure73L commented 8 months ago

This is not completed. If you close an issue, please mark it correctly.

twelve-of-code-official / website