Git mess

It’s a simple sequence of git checkout ; git merge <………> ; git checkout ; git merge <………> ; etc. (for each patch branch), then a merge of all the merged patch branches onto the ‘patches’ branch (an octopus merge may be possible), then I check if everything has merged appropriately (a quick look through SourceTree and a successful build is usually sufficient), then a second script pushes all branches on my fork.

2 Likes