Resources
I’m not the deep exp
ert on all things Git-related, however this does sound like a candidate for rebasing. It’s not something I routinely do, but read up on it and see if this sounds like the best way forward.
Owen James sent Today at 4:12 PM
It’s designed for situations where the base has upgraded (such as further tags) and you want to bring it up to date.
version control – Git for beginners: The definitive practical guide – Stack Overflow
Git merge branch without history