https://bugs.kde.org/show_bug.cgi?id=399192

--- Comment #6 from Nate Graham <n...@kde.org> ---
We don't use `arc` for any of this part; it's just pure git tooling. Here's the
process:

1. Find the hash of the commit. It's 943122b4429de6ceb113fb7b3ede6c2b4036965d
for this one.

2. Check out the oldest stable branch, which is for 5.12: `git checkout
plasma/5.12`

3. Cherry-pick the commit onto that branch: `git cherry-pick
943122b4429de6ceb113fb7b3ede6c2b4036965d`

4. Push that change to the remote repo: `git push`

5. Now that the commit is on the oldest stable branch (plasma/5.12), merge it
onto the next-newest stable branch, which is plasma/5.14:
- `git checkout plasma/5.14`
- `git merge plasma/5.12`
- `git push`

6. Ordinarily, at this point you would merge the newest stable branch to
master, but this time there's no need since you landed the commit on master so
it's already there.

Let me know if you need a hand with anything!

This is the typical merge-to-master workflow that we follow with all commits to
stable branches. In the future, if you land your patch on the stable branch
(because it's a bugfix and doesn't change any strings), you'll always do this,
and won't have to cherry-pick it onto the stable branch first.

-- 
You are receiving this mail because:
You are watching all bug changes.

Reply via email to