After three days of hard work
I finally successfully merged the two branches VolumetricLighting-4.15 and NvFlowPlugin-4.15
No Github share, because my git clone is too slow, I take zip directly to merge.
Flow should be the easiest to merge in several branches, and the whole process only happens to discover the real conflict once.
Some tips on merge:
1 find somewhere to learn git and github basic skills
2 use other small projects to practice your git skills first
3 use SSD, or even ram disk to improve the merge speed
4 if git clone is slow, try zip
5 Other 4.15 compiled version After running setup.bat, the generated file seems to be able to copy directly