Thanks Jonas,
I got main working again by changing the mirror to a force pull, since
that branch is meant to be protected anyway. I've also learnt about
force pushes which is helping with the rebases too! I'm now trying to
clean up my merge requests.
Gareth aka. Kit
On 30/10/2021 21:43, Jo
On 30/10/2021 22:26, J. Gareth Moreton via fpc-devel wrote:
Just to clarify, I cannot delete the branch because it's the default
branch, and it won't update with the mirror because it's diverged, and I
can't revert the accidental commit on Gitlab because it just adds a new
commit saying the las
Just to clarify, I cannot delete the branch because it's the default
branch, and it won't update with the mirror because it's diverged, and I
can't revert the accidental commit on Gitlab because it just adds a new
commit saying the last one is reverted, and is still marked as diverged.
Gareth
Hi everyone,
I need a little bit of help. I made a mistake and accidentally pushed
on my local main branch. I'm trying to revert it so I can resynchronise
it with FPC's main branch, but it's not letting me. Do you know what I
have to do?
Gareth aka. Kit
--
This email has been checked for
On Sat, 17 Jul 2004 13:59:33 +0200 Jonas Maebe <[EMAIL PROTECTED]> wrote:
>
> On 17 jul 2004, at 12:02, Mattias Gaertner wrote:
>
> > Compiling lazarus with current fpc (since about a week) gives
> >
> > synmacrorecorder.pas(618,43) Error: Asm: [mov ???,mem32] invalid
> > combination
> > of op
On Sat, 17 Jul 2004 12:29:24 +0200 (CEST) [EMAIL PROTECTED] (Marco van de
Voort) wrote:
> > Compiling lazarus with current fpc (since about a week) gives
> >
> > synmacrorecorder.pas(618,43) Error: Asm: [mov ???,mem32] invalid
> > combination of opcode and operands
> >
> > I tried to create a s
On 17 jul 2004, at 12:02, Mattias Gaertner wrote:
Compiling lazarus with current fpc (since about a week) gives
synmacrorecorder.pas(618,43) Error: Asm: [mov ???,mem32] invalid
combination
of opcode and operands
I've just compiled Lazarus three times with the latest compiler (-O-1p3
-al, -O-1p3 a
> Compiling lazarus with current fpc (since about a week) gives
>
> synmacrorecorder.pas(618,43) Error: Asm: [mov ???,mem32] invalid combination
> of opcode and operands
>
> I tried to create a small example for a bug report, but was not able to
> reproduce it in a small example.
>
> procedure T
Compiling lazarus with current fpc (since about a week) gives
synmacrorecorder.pas(618,43) Error: Asm: [mov ???,mem32] invalid combination
of opcode and operands
I tried to create a small example for a bug report, but was not able to
reproduce it in a small example.
procedure TCustomSynMacroRe
