[Github-comments] [geany-plugins] Addons bookmark refresh fix (#284)

[Colomban Wendling]

yes, it very well might.  But you should be able to fix that fairly easily to fix: check master out, pull (fast-forward, `pull --ff-only`) from upstream, and rebase your branch on top of that.  Or you can also just `rebase -i 8234f7c^` and remove the two offending/duplicate commits, only keeping yours.  As it's a separate branch, there won't be no problem.

---
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany-plugins/pull/284#issuecomment-141795035
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.geany.org/pipermail/github-comments/attachments/20150920/7d522996/attachment.html>