'How to preserve files on merge after git revert
We have 3 branches:
- Master
- v9.3.0
- v9.0.0
We realized that some code on 9.3.0 was wrong and we decided exclude it. So we reverted master to 9.0.0.
We created a new branch call 9.1.0 just with code that worked on 9.3.0, excluding two of the three minor changes.
Now we've created a PR from 9.1.0 to master, but it says 9.1.0 is behind master. When we try to merge master, all the changes in 9.1.0 are marked as modified and some files that exist in 9.1.0 are marked as deleted as well.
Why the changes in 9.1.0 are not marked as new ones?
I appreciate your help.
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|