Review differences between master and develop
timlinux opened this issue · 3 comments
I am trying to harmonise the master and develop branches. I am going to merge develop to master but there are a few differences which I have not resolved:
git diff origin/develop
Please review the changes listed in the attached and see if any need to be merged into develop and master (I am going to force merge develop and master so they are matched)
@timlinux Can I confirm the process?
So, should I commit the fix on master then pull it to develop or the other way around? (put the commit in develop then let master pull from develop).
@timlinux I think the remaining conflicts were just diciding what the next version will be.
If I look at the GitHub release page, we have version 5.0.1.
In the metadata.txt in develop, our current version is 5.0.2, but it's not yet released in GitHub.
In the metadata.txt in master, our current version is 5.0.3, again not yet released in GitHub.
We just have to decide which one is the next version/release? Which one is correct, 5.0.3 or 5.0.4
