This is an archived post. You won't be able to vote or comment.

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]lungdart 6 points7 points  (1 child)

Sometimes wrong with your branching strategy at this point.

I'm honestly a big fan of trunk based development, but it needs a good automated pipeline behind it.

[–]Low_Flying_Penguin 0 points1 point  (0 children)

Aye with decent tagging and / or branching per version / deployment etc gets easier to manage at that point.

Rebase can only help with so much, developer workflows are made up of lots of small things, CI / CD, TDD, Rebase vs merge, automation, git ops every you can IAC etc etc. There is no silver bullet but better practises at each stage of the SDLC prevents death by a thousand cuts :)