I don‘t really understand what your problem with fearure branches is.
There 2 scenarios:
1) I have my independent feature, work on it in my branch and merge in develop several times a day to get all the chances. As soon as I push CI runs all tests and tells me if everythings being integrated well. If there r conflicts, I fix them right away.
2) same as above obly that i depend on other branches: I‘d say the main cause is that ur planning is flawed. Obviously the dependencies weren‘t defined peoperly and you shouldn‘t alread work on it.
If you absolutely have to, the solution is to just merge those branches in ur branch.
It takes some communication though bc obvioulsy ur working on related features.
These two strategies never failed me!
But I heard of colleagues who managed to not merge develop into their long running branch for weeks and then wonder why there are so many conflicts 😒
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
I don‘t really understand what your problem with fearure branches is.
There 2 scenarios:
1) I have my independent feature, work on it in my branch and merge in develop several times a day to get all the chances. As soon as I push CI runs all tests and tells me if everythings being integrated well. If there r conflicts, I fix them right away.
2) same as above obly that i depend on other branches: I‘d say the main cause is that ur planning is flawed. Obviously the dependencies weren‘t defined peoperly and you shouldn‘t alread work on it.
If you absolutely have to, the solution is to just merge those branches in ur branch.
It takes some communication though bc obvioulsy ur working on related features.
These two strategies never failed me!
But I heard of colleagues who managed to not merge develop into their long running branch for weeks and then wonder why there are so many conflicts 😒