On 2020.05.22 18:52, Thomas Schmitt wrote:
remote: error: denying non-fast-forward refs/heads/win32_first_tno_fix (you
should pull first)
Yeah, that error is typical of git repos where you can't use force to
push changes.
On one hand, not allowing force ensures that people who cloned
Hi,
Pete Batard wrote:
> it doesn't look like the repo is configured to allow force
Indeed. Now that my branch is useless, i tried
git push --force-with-lease
and got
remote: error: denying non-fast-forward refs/heads/win32_first_tno_fix (you
should pull first)
So i finally ran another
On 2020.05.22 17:24, Rocky Bernstein wrote:
Sure - push directly to master. Thanks.
Done. Thanks.
/Pete
Hi Thomas,
On 2020.05.22 16:21, Thomas Schmitt wrote:
Pete Batard wrote:
That's called squashing. You should be able to find plenty of help on how to
do that using git rebase, such as https://gist.github.com/jbub/5766366
Ok. I'm now squashed at git push.
Question is whether i should push
Hi,
Pete Batard wrote:
> That's called squashing. You should be able to find plenty of help on how to
> do that using git rebase, such as https://gist.github.com/jbub/5766366
Ok. I'm now squashed at git push.
Question is whether i should push with --force or --force-with-lease.
(Re-sent to CC the mailing list)
On 2020.05.21 08:30, Thomas Schmitt wrote:
Pete Batard wrote:
I would advise to combine the 2 commits into a single one before merging,
That's reasonable. But how to do it without invalidating your testing?
That's called squashing. You should be able to
Hi,
Pete Batard wrote:
> I would advise to combine the 2 commits into a single one before merging,
That's reasonable. But how to do it without invalidating your testing?
Is there a git gesture or do i have to make a new branch and copy the
tested win32.c from the old branch ?
Have a nice day
On 2020.05.20 22:17, Thomas Schmitt wrote:
Pete, if you can checkout branch "win32_first_tno_fix" (*) then it would
be nice to get a confirmation that i got my version of win32.c on the
second try by copy+paste of your corrected code.
(First commit of the branch was my faulty proposal by
On Wed, May 20, 2020 at 5:18 PM Thomas Schmitt wrote:
> Hi,
>
> Pete Batard wrote:
> > Since it's your patch, I'll let you push it to master.
>
> Rocky once instructed me to make candidate branches for such occasions.
> It's too late in the night to try new tricks. :))
>
> Pete, if you can
Hi,
Pete Batard wrote:
> Since it's your patch, I'll let you push it to master.
Rocky once instructed me to make candidate branches for such occasions.
It's too late in the night to try new tricks. :))
Pete, if you can checkout branch "win32_first_tno_fix" (*) then it would
be nice to get a
Hi Thomas,
Your patch looks good. :)
$ ./src/cd-info.exe --dvd --no-device-info
cd-info.exe version 2.1.0 i686-w64-mingw32
Copyright (c) 2003-2005, 2007-2008, 2011-2015, 2017 R. Bernstein
This is free software; see the source
11 matches
Mail list logo
