Closed Mesure73L closed 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.
But what if you're working on something in develop
, like Twelve of Code, so you can't merge main
into develop
?
Now, develop is not behind main anymore.
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.
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
This is not completed. If you close an issue, please mark it correctly.
What problem were you having?
The
develop
branch has commits ahead of (which is fine) and behind (which is NOT fine) themain
branch.What solution would you like?
Don't allow anything to be merged into
main
without being merged intodevelop
first.What alternatives have you considered?
Just be smart to avoid conflicts.
What are some pros and cons of doing this?
Pros:
Cons:
What page is this for?
Repository