Git merge workflow: reverse it?

[Bhushan Shah]

Hello everyone!

At plasma, we are experimenting with new workflow regarding how bugfixes
are put on the stable branch [1].

# Previous workflow

- Current workflow is that we commit to stable branch and then merge it
  upwords until master branch
- i.e commit to Plasma/5.18 branch, merge 5.18 into 5.19 and then
  master

# Current workflow

- Proposed workflow is to instead commit all changes in master, and
  cherry-pick related changes in the stable branch as needed
- We had been using this workflow for about 1 month now and I'd say it
  is working nicely for us.

# Why?

We occasionally hit several issues with previous workflow,

- Merge conflicts when merging changes upwords
- Changes which are valid only for stable branch needs to be reverted in
  master branches. So you end-up with, stable-fix, revert of stable fix
  and then different fix and overall weird history.
- Accidential merges from the master branch to stable branch which
  needs to be force-resetted.
- It's worth noting that Qt also recently changed to merge to dev,
  cherry-pick backwards.
- This also allows for workflows where we want to commit some bugfix in
  the master branch for few days/weeks and if it works fine in general
  testing then, cherry-pick it in stable branches.

Proposal is to probably adapt this policy kde-wise if people feel that
advantages are worth it.

Thanks

[1] https://mail.kde.org/pipermail/plasma-devel/2020-June/117887.html

-- 
Bhushan Shah
http://blog.bshah.in
IRC Nick : bshah on Freenode
GPG key fingerprint : 0AAC 775B B643 7A8D 9AF7 A3AC FE07 8411 7FBC E11D
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20200729/6164dc5e/attachment.sig>