Re: [Libcdio-devel] [PATCH] Fix gcc warnings

[Rocky Bernstein]

On Sun, Mar 26, 2023 at 7:08 AM Mario Đanić <mario.danic@gmail.com> wrote:

> Rebase or merge. There are always ways :)
>

I never suggested this was the only way. I wrote that this was *a *command-line
way (with a misspelling of "an" for "a")
of what *might *be done. There are numerous other ways as well, and some of
those have slight semantic differences.

But for this particular situation, I am not sure merge versus rebase
matters that much.

Right now, I am more interested in the bigger picture.


>
> On Sun, 26 Mar 2023 at 12:57, Thomas Schmitt <scdbackup@gmx.net> wrote:
>
> > Hi,
> >
> > Rocky Bernstein wrote:
> > > There is no way you can mess up in git, because history is saved by
> > default
> > > for *everyone. *And specifically I have a copy.
> >
> > I still see the opportunity for a race condition in the time window
> > between pull and push.
> > What happens if somebody else pushed a modified master after i pulled
> > but before i push ?
> >
> >
> > Have a nice day :)
> >
> > Thomas
> >
> >
> >
>