Re: Accidental merge into libs-gui

[Sergii Stoian]

I'm sorry, Fred.

Although my PR #43 marked as merged now. It seems there is no way to reopen PR that was marked as merged.

BTW, I've failed to find a solution for pulldown popup button ("merged" PR). The NeXT and Apple styles are too different to do what I want in clean and elegant way. I'll hold this patch inside NEXTSPACE.

I'll create a separate PR for tiny change regarding menu positioning later.

On Fri, Jan 3, 2020 at 3:33 PM Fred Kiefer <address@hidden> wrote:

You really had me in a short state of shock when coming back from jogging and seeing this merge had happened. Thank you for cleaning up that quickly!

Fred

> Am 03.01.2020 um 13:50 schrieb Sergii Stoian <address@hidden>:
>
> Fixed.
> I've used `git rebase -i` and `git push origin master --force`. Everything looks correct now.
>
> On Fri, Jan 3, 2020 at 2:20 PM Sergii Stoian <address@hidden> wrote:
> Guys,
>
> I've made accidental merge into libs-gui (my intention was to merge changes into my fork from master). What should I do better to remove this merge: `git reset --hard` into commit before merge?
>
> Sergii
>
>
> --
> Sergii Stoian,
> ProjectCenter lead developer
> NEXTSPACE owner, lead developer

--

Sergii Stoian,

ProjectCenter lead developer

NEXTSPACE owner, lead developer