D7793: Fix sidebar labels being unreadable when selected or hovered over

[Henrik Fehlauer]

rkflx added a comment.


  `arc` will squash and push all commits from the current branch which are not yet in the target branch, in your case all commits exclusive to master in addition to your patch. As you noticed correctly, that's not what you'll want. I'd probably prefer to move such a patch to Applications/17.08 locally via `git` first, to check everything worked and still compiles:
  
  - `git checkout Applications/17.08`, `git pull`
  - `git cherry-pick master`
  - `gitk`, `make`, `arc land --preview`, …
  - `arc land`
  
  Now for the merge (see also here <https://phabricator.kde.org/source/ark/browse/master/HACKING>):
  
  - `git checkout master`
  - `git reset --hard origin/master` to get rid of your original patch
  - `git pull`
  - `git merge -Xours origin/Applications/17.08`
  - `gitk --all`, `git push --dry-run`
  - `git push`

REPOSITORY
  R223 Okular

REVISION DETAIL
  https://phabricator.kde.org/D7793

To: ngraham, aacid, #okular, #kde_applications, broulik, sander, rkflx
Cc: rkflx, aacid
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/okular-devel/attachments/20170922/ed78d800/attachment.html>