'Merging in old git branch removing current work
I was working on a branch some time ago and did good bit of work. I then worked on a separate development branch for awhile and am now looking to merge in the previous one.
However, when I merge in the older branch, it's removing changes from the current one without any conflicts. I've tried rebasing, a separate branch, squashing commits, merging from both directions etc... and nothing has worked.
What's even weirder is I created a new branch in Github, tried to merge in the older branch directly in the UI. I received conflicts as expected and was able to resolve them via the editor. But after merging it in and pulling in the new branch, none of the changes are there and it looks like the conflict resolutions were ignored.
Anyone have any idea how to resolve this?
githubSources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|