With 4.3 on the horizon the ages old question arises again: how the beep am I supposed to migrate from the current branch to the new one?
I asked one of my day-job colleagues who is kinda Git-savvy and he identified the major problem in that area being that the two branches simply manifest themselves from the depths of that Perforce bot, loosing all info that one day they had a common origin*. This makes all merging or rebasing or whatever black git magic one attempts a pure PITA
so far (up until incl. 4.2.1) after days after days after days of rebasing, merging, patching and whatnot I ended up braking off the edge of my desk and wanting to k* someone with it in my rage :mad: lol…well, in the end we transferred our hand-full changes manually and pretty much started over.
THIS TIME the manual brute force approach is not an option for us.
Our own code additions have simply outgrown that black non-magic MacGyver brute force trickery
We seriously need to “professionalize” that process.
I could not find any satisfactory post/answer anywhere - are we the only ones who have problems with migrating branches? O.O
Or is it just my ignorance of Git/Github? xD
Anyhow we appreciate any help we can get to solve this mystery and give everyone a clean, defined process of how to do such a task in a way that inspires confidence instead of fear and rage.