Please sync main branch with develop

Question

Please sync main branch with develop

Closed this issue 2 years ago · 12 comments

Kojoley commented 2 years ago

The branches diverged and contain disjoint commits.

Answer 1 · 2022-09-26T00:17:27.000Z

master and develop are synced now.

Answer 2 · 2022-09-26T00:23:54.000Z

GitHub still shows

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

Answer 3 · 2022-09-26T01:25:12.000Z

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

Answer 4 · 2022-09-26T01:56:58.000Z

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.

Answer 5 · 2022-09-26T02:01:36.000Z

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

Answer 6 · 2022-09-26T04:39:05.000Z

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.

Answer 7 · 2022-09-26T05:30:02.000Z

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

Answer 8 · 2022-09-26T06:03:46.000Z

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

Merged.

Answer 9 · 2022-09-26T17:35:22.000Z

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.

Answer 10 · 2022-09-27T03:55:24.000Z

#246 still wasn't merged to master.

Answer 11 · 2022-09-27T04:10:38.000Z

#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.

Answer 12 · 2022-09-27T05:28:14.000Z

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.