Closed stormi closed 4 years ago
Another way to do it, probably the best way in my eyes: create a test branch out of the 8.0 branch. Merge the XS branch into it. Solve the conflicts manually. Compare with my results in master branch.
Done by @Wescoeur
There were lots of conflicts (across 8 different files with several conflicts per file) when I merged the CH 8.1 installer codebase with ours. Most were due to a code cleaning operation Citrix devs have done, that overlap parts that we changed.
I have solved all conflicts manually using meld as a merge tool, but I may have introduced errors or failed to see changes in the codebase that would require changes in our specific code.
Thus I need someone to review my changes.
Suggested double check: