davidhurka added a comment.

  You could consider to add these bugs as BUG keywords to this patch: 386578, 
374728, 352310, 330518, 341914, 157289
  
  - https://bugs.kde.org/show_bug.cgi?id=386578 Allow annotation mode to 
"stick" for better use with a stylus
  - https://bugs.kde.org/show_bug.cgi?id=374728 Changing annotation colours
  - https://bugs.kde.org/show_bug.cgi?id=352310 to organize better the 
annotation tools, i want to add separators between them
  - https://bugs.kde.org/show_bug.cgi?id=330518 Add configure icon to the 
annotation toolbar
  - https://bugs.kde.org/show_bug.cgi?id=341914 Allow Annotation Tools in 
Toolbar
  - https://bugs.kde.org/show_bug.cgi?id=157289 Make the review bar a standard 
toolbar
  
  In D15580#495344 <https://phabricator.kde.org/D15580#495344>, @simgunz wrote:
  
  > I messed up something... I see many files I have not modified that are 
marked as modified here. Probably because I changed the origin remote and my 
master was not in sync with upstream. I'll fix this with the next arc diff, now 
it does not let me arc diff again because it says that the diff is empty.
  
  
  Did you try `git pull` in the master branch, then `git merge master` and `arc 
diff --base git:master` or so on your branch? I think you had the wrong base.

REPOSITORY
  R223 Okular

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

To: simgunz, #okular
Cc: cfeck, aacid, davidhurka, knambiar, ngraham, tobiasdeiminger, okular-devel, 
maguirre, fbampaloukas, joaonetto, kezik, tfella, darcyshen

Reply via email to