What is your product version?
- 8.9
What is your product type (Angular or MVC)?
- Angular
What is product framework type (.net framework or .net core)?
- .Net Core
What is ABP Framework version?
- 5.9
We are trying to update the project version to ASP.Net Zero 8.9. While following the steps from the following link - Version-Updating, we are able to complete the merge process but the files are not merged correctly.
It seems that the default git merge strategy (recursive) is not able to handle the merging in this case. Other git merge strategies also did not work properly in any case. We have tried following two approaches for merging
- Using the latest project code in the base branch (master, dev), copying ASP.Net Zero 8.9 code in another (aspnetzero) branch, merging aspnetzero into dev
- Using the ASP.Net Zero 8.9 code in base branch (master, dev), copying latest project code in another (migrate) branch, merging migrate into dev
The merge process complete successully but the code in destination branch gets removed in both the cases mentioned above. Can you please let us know a version update process that can work seamlessly?
Thanks in advance.
1 Answer(s)
-
0
Hi @csona
Our suggestion is this one;
Using the ASP.Net Zero 8.9 code in base branch (master, dev), copying latest project code in another (migrate) branch, merging migrate into dev
Could you explain how the code in destination branch (dev/msater) gets removed ? Do you see no changed or something else happens ?
If you are storing your code online, can we acess it to cehck this problem ?
