Hi,
I just messed up with the patch-13.1.1 branch, merging develop in the wrong direction.
I will fix that fast, please don’t update your repositories before I fix my errors!
Hi,
I just messed up with the patch-13.1.1 branch, merging develop in the wrong direction.
I will fix that fast, please don’t update your repositories before I fix my errors!
OK, it should be fine now.
As we will later on merge these branches back together, I could not use git revert, so I did something really ugly, deleting the branch on gitlab and recreating it from an earlier commit before the faulty merge.
You can blame me
![]()
Hi Luc,
no worries, thanks for fixing it so quickly.
Would this accident have happened if the “patch-*” branches were protected?
If yes that’s an easy safeguard to add
Cheers,
Romain
I really, really don’t like all these safeguards.
Yes, I know, old school, declining brain, grumpy…
Part of the issue was just that develop is protected, so I had to juggle with branches, and I failed dramatically at this.
I think I should just let fresh young brains handle things I cannot do anymore.