[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Accidental merge into libs-gui
|
From: |
Fred Kiefer |
|
Subject: |
Re: Accidental merge into libs-gui |
|
Date: |
Fri, 3 Jan 2020 14:32:49 +0100 |
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