I have spent the entire morning in git surgery. Rebasing over multiple microservices after code reversion + update for a hotfix happened in submodule; grafting code back on that hopefully hasn't diverged too much in the interim.
This is not a part of the current contract that I enjoy.
@DrCuriosity ugh. You have my sympathies. It's why I still always take a full code backup before doing any major work on a complex (or even simple) git repo... Even so, wouldn't be without git, and in fact I think *everyone* should be git-literate.
🇳🇿
challenging source code control
@lwriemen when you haven't been flogged enough the first time, eh. Handy!
@DrCuriosity