Moin Am 23.01.2023 11:46 schrieb BiT dev:
Cherry-picking a commit or even checking out single file to merge/commit it into another branch is IMHO more complex than...
I agree. If we have to do this the commit wasn't small (atomar?) enough. ;) But sometimes a commit changed to many things and you don't want to have all of that changes in your "main".
commiting to "main" and forward-integrate the commit via merging "main" into "dev".
It is also a way. There are many ways with git. Makes me headache often. ;) I had in mind that most of the time "main" and "dev" are to far away form each other. And merge one into the other would cause a lot of trouble and merge conflicts. Imagine in one year when main is just "1.3.3" but in dev we fixed and added a lot of things (~ 100 commits) then we add new information to the README.md... In that case there may be an easier way. But for myself as a git-unprofessional I would simple checkout the README.md from dev in main.
If we stick to PRs for README.md changes in "main" we also have a "2nd line of defense"
Yeah! For me it is one of the biggest advantages: I can't destroy that much.
Any comments or other proposals?
I'm fine with stickin to PRs and then see how we solve other upcomming "problems" with git and branches.