Please sync main branch with develop about fusion

[djowel]

master and develop are synced now.

[Kojoley]

GitHub still shows

Differences:
develop...master
master...develop

[djowel]

Just to be sure I'm not messing up something:
#259

[Kojoley]

I think you need to merge master to develop, then merge develop to master, and then you will be able to fast-merge master to develop, after which branches will be equal.

[djowel]

Alright, let me do this again. Pardon my confusion!

[djowel]

Here was the issue after pushing (with fast-merging master to develop):

~/dev/boost/libs/fusion> git push --porcelain --progress --recurse-submodules=check origin refs/heads/develop:refs/heads/develop
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: error: GH006: Protected branch update failed for refs/heads/develop.        
remote: error: This branch must not contain merge commits.        
To github.com:boostorg/fusion.git
! refs/heads/develop:refs/heads/develop [remote rejected] (protected branch hook declined)
failed to push some refs to 'github.com:boostorg/fusion.git'
Done
'develop' rejected (non-fast-forward)

I temporarily disabled GitHub's "Require linear history" rule on protected branches (develop)
(Prevent merge commits from being pushed to matching branches.)

It's now in sync. Next time, I'll enforce always merging PRs to develop to avoid this mess. Some PRs were merged to master.

Please check the state if I messed up anything.

[denzor200]

Please, dont forget about this: #246.
I seen that these troubles fixed here a884709, but it's not enough

[djowel]

Please, dont forget about this: #246. I seen that these troubles fixed here a884709, but it's not enough

Merged.

[Kojoley]

It's now in sync. Next time, I'll enforce always merging PRs to develop to avoid this mess. Some PRs were merged to master.

Please check the state if I messed up anything.

The history looks quite sad with duplicated commits, but it works. Now develop is superset of master branch.

It is indeed much less gymnastics and pain when you don't create commits in master which have not land in develop, I also learned that the hard way. It is also sad that GitHub UI buttons don't give you a choice to create a fast-forward merge when you want to sync master with develop, though generally it is a good idea to always use git pull/merge with --ff-only flag unless you really mean to create a merge commit. Btw, one haven't messed up until they push local changes to the repository server.

[denzor200]

#246 still wasn't merged to master.

[djowel]

#246 still wasn't merged to master.

Is it a priority? Normally we let code sit on develop for a while to minimize disruptions on master.

[denzor200]

Is it a priority? Normally we let code sit on develop for a while to minimize disruptions on master.

It's just a small fix for possible compile-time error.