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,
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
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
Fixed.
Michael.
On Sat, 30 Oct 2021, J. Gareth Moreton via fpc-devel wrote:
(Meant to send that to the Core team, sorry, but it's probably applicable
here too)
On 30/10/2021 18:33, J. Gareth Moreton via fpc-devel wrote:
Hi everyone,
It seems that as of this e-mail, the
(Meant to send that to the Core team, sorry, but it's probably
applicable here too)
On 30/10/2021 18:33, J. Gareth Moreton via fpc-devel wrote:
Hi everyone,
It seems that as of this e-mail, the build-and-test-job script fails
for the main branch. It's failing on a package:
External
Hi everyone,
It seems that as of this e-mail, the build-and-test-job script fails for
the main branch. It's failing on a package:
External command "/builds/freepascal.org/fpc/source/compiler/ppcx64
-Tlinux -FUhash/units/x86_64-linux/
