Lazarus
Home
Help
TinyPortal
Search
Login
Register
Lazarus
»
Forum
»
Free Pascal
»
FPC development
(Moderators:
FPK
,
Tomas Hajny
) »
Messed merge request
Free Pascal
Website
Downloads
Wiki
Documentation
Bugtracker
Mailing List
Lazarus
Website
Downloads (Laz+FPC)
Packages (OPM)
FAQ
Wiki
Documentation (RTL/FCL/LCL)
Bugtracker
CCR Bugs
GIT
Mailing List
Other languages
Foundation
Website
Useful Wiki Links
Project Roadmap
Getting the Source
Screenshots
How to use the forum
Forum Rules
About donations (wiki)
Bookstore
Computer Math and Games in Pascal
(preview)
Lazarus Handbook
Search
Advanced search
WIKI Timeout issues
Please read here if you have trouble connecting to the wiki
Recent
Questions about GUID decl...
by
Thaddy
[
Today
at 04:28:09 pm]
Tangled Line Pattern Make...
by
Boleeman
[
Today
at 04:27:51 pm]
DBF edit & append problem
by
Petrus Vorster
[
Today
at 04:08:21 pm]
controls.lpr(731,15) Erro...
by
dseligo
[
Today
at 03:31:46 pm]
[Solved] Can't install mo...
by
lainz
[
Today
at 03:28:41 pm]
internal Compiler Error
by
Thaddy
[
Today
at 03:21:04 pm]
Reference to bsSolid give...
by
wp
[
Today
at 03:09:17 pm]
[Solved]Open Project fail...
by
cdbc
[
Today
at 03:06:30 pm]
Popup Form to close when ...
by
Thaddy
[
Today
at 02:10:55 pm]
Spikey Splat Creatures fr...
by
Boleeman
[
Today
at 01:19:35 pm]
Amigo programming languag...
by
paxscript
[
Today
at 12:20:33 pm]
Input Chinese using Micro...
by
momigo
[
Today
at 10:50:40 am]
Ballet of Lines and Dots ...
by
Boleeman
[
Today
at 09:19:59 am]
Using icons in own open s...
by
paule32
[
Today
at 08:14:05 am]
ChatGPT and ObjectPascal ...
by
Thaddy
[
Today
at 07:56:29 am]
control '' has no parent
by
Thaddy
[
Today
at 07:23:07 am]
Converting excel to csv -...
by
andresayang
[
Today
at 01:44:28 am]
Persistent MacOS Arm M ch...
by
BVale
[
Today
at 12:05:12 am]
Original game - 3 Cross
by
TBMan
[
Today
at 12:01:24 am]
Exporting larger files
by
Guser979
[July 08, 2025, 11:55:04 pm]
json goes RichMemo
by
Thaddy
[July 08, 2025, 08:52:20 pm]
MDI ChildForm
by
CharlyTango
[July 08, 2025, 08:41:25 pm]
Fern Leaf Fractal (Recurs...
by
Lulu
[July 08, 2025, 07:54:23 pm]
Trouble compiling fpc for...
by
ermok
[July 08, 2025, 06:21:06 pm]
Feature request: hard typ...
by
440bx
[July 08, 2025, 05:53:44 pm]
« previous
next »
Print
Pages: [
1
]
Author
Topic: Messed merge request (Read 583 times)
regs
Jr. Member
Posts: 81
Messed merge request
«
on:
May 08, 2025, 06:54:59 pm »
Can someone look into this. I wanted to rebase it, but rebase button in merge request page wasn't showing, so i clicked update fork in branch page. And that messed up branch hard. Revert didn't seem to work correctly and messed up even more. I closed it for now. Is it salvageable? Or needs to redo everything from scratch?
https://gitlab.com/freepascal.org/fpc/source/-/merge_requests/975
Logged
regs
Jr. Member
Posts: 81
Re: Messed merge request
«
Reply #1 on:
May 08, 2025, 08:05:10 pm »
Made a new MR. Turnout out to be easier with GitLab UI, than reverting and restoring. Though it exposed email...
«
Last Edit: May 09, 2025, 08:30:06 am by regs
»
Logged
Print
Pages: [
1
]
« previous
next »
Lazarus
»
Forum
»
Free Pascal
»
FPC development
(Moderators:
FPK
,
Tomas Hajny
) »
Messed merge request
TinyPortal
© 2005-2018