Re: [GNC-dev] New branch mistake

[Robert Fewell]

Thank you.
Bob

On Sat, 28 Nov 2020 at 19:10, Geert Janssens 
wrote:

> Bob,
>
>
>
> The command to execute would be
>
> git push origin :bug309943
>
> (I have done so for you already)
>
>
>
> This will push the "empty" branch to bug309943, effectively removing it.
>
>
>
> The git devs use odd logic from time to time...
>
>
>
> Regards,
>
>
>
> Geert
>
>
>
> Op zaterdag 28 november 2020 12:38:54 CET schreef Robert Fewell:
>
> > Hi Guys,
>
> >
>
> > I think I got my bug_branch and branch the wrong way round and created a
>
> > new branch on code/github of bug309943.
>
> >
>
> > Could someone remove / advise on command to do this on code.
>
> >
>
> > Regards,
>
> > Bob
>
> > ___
>
> > gnucash-devel mailing list
>
> > gnucash-devel@gnucash.org
>
> > https://lists.gnucash.org/mailman/listinfo/gnucash-devel
>
>
>
>
>
___
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel

[GNC-dev] news/news-script.php: Please commit your changes or stash them before you merge.

[Frank H. Ellenberger]

Hello Linas,

I hope, you are well despite you were not in IRC the last months. We
have a problem to update the master branch of www.gnucash.org.

Circa 5 years ago Geert committed your change of news/news-script.php
required by the upgrade to PHP5.

Since I tried to change the file on 2020-10-07, we can no longer update
the master branch.

For my pushes, I get 'Ncat: Connection reset by peer.'
When Derek told www to pull, he got
> error: Your local changes to the following files would be overwritten
by merge:
> news/news-script.php
> Please commit your changes or stash them before you merge.

So mit seems, we need your help.

Regards
Frank
___
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel