[Github-comments] [geany/geany-plugins] GeanyLua: Add function geany.reloadconf() (#653)

[elextr]

@Skif-off yeah for git the console is better.

What I understand @frlan' is asking is for you to do a [git rebase](https://git-scm.com/docs/git-rebase) against the master branch to combine the two commits together and hopefully make the merge you did in your branch disappear (lesson: only ever pull Geany master into your master, not your branch).

`git rebase --interactive` makes it easier.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany-plugins/pull/653#issuecomment-360919866
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.geany.org/pipermail/github-comments/attachments/20180126/bceaa4c4/attachment.html>