5
I’m in the following situation: I have a Git repository, and at a certain point I created a branch from master. I didn’t do much in that branch at the time, and then I advanced the master branch through several commits, and the code changed a lot.
Now I needed to resume work on this branch and complete it, only it got complicated because the branch is really far behind. There are two problems:
It gets hard to implement back there when the code was one way, if now changed a lot.
Even if I implemented what I wanted based on that old code, then to match what’s in the master branch I have no idea what it would be like, because it turns out it would be very different code.
The only solution I could think of was to find a way to take this branch and advance it to look like the master branch and redo its work. But it doesn’t seem perfect either, because after all I would miss what had already started in this branch.
In that sense how do I fix it? How can I get back to work on that branch if I’ve advanced too far to master branch and now the code is very different?
It is not an issue properly classified as software project (design software). Removing this tag will make it easier to locate issues.
– user158926