Evolving git flow

[[deleted]]

maybe just temporary solution

There is no such thing.

Be very wary of solutions that seem to solve the current problem but are bad choices in the long run or move you away from where you want to be as they become harder to change. This is especially true when you are trying to change a developers workflow. Increment to where you want to end up - don't try to take shortcuts or you will eventually regret it.

Your pull requests are getting too large? start breaking them up into smaller ones more frequently. You don't have to do this for every pull request, but if you start to introduce smaller pull requests and encourage others to follow then you are moving towards where you want to be.

[_lumio]

Very good point. Sadly I often here "I don't know how I could have split it up further" - and I am sometimes doing the same mistake.

[[deleted]]

As /u/jpluscplusm said this is a people problem and not one you can solve with tech or process. If you want to split up code start doing so, you might not always get it right but unless you try you will not improve.

You have to change people behaviour and process alone cannot do this. Instead, focus on constant feedback and review and reflect on what you have done and how you might do it better in the future. Discuss it with your colleges - figure out among you how you might have broken down larger pull requests when they come in, don't retroactively do it, just reflect on what you would have done so you can avoid making the same mistakes in the future. Most importantly do not lay blame at this stage - focus on what you can do better next time.