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
Recent
Question re. FCL's ssocke...
by
Curt Carpenter
[
Today
at 12:22:45 am]
Error: Enumeration symbol...
by
tetrastes
[
Today
at 12:04:56 am]
SpkToolbar custom update
by
wp
[December 14, 2025, 11:55:55 pm]
TLazSerial : serial port ...
by
tetrastes
[December 14, 2025, 09:57:52 pm]
[hacked for now] Changing...
by
jamie
[December 14, 2025, 09:00:23 pm]
Access Violation - Databa...
by
1HuntnMan
[December 14, 2025, 07:01:25 pm]
MVP made easier.
by
cdbc
[December 14, 2025, 05:14:40 pm]
Lazarus is not working
by
Fred vS
[December 14, 2025, 05:14:20 pm]
TIBDataSet "Closing"? on ...
by
RedOctober
[December 14, 2025, 04:52:18 pm]
Recomendations for conver...
by
BlueIcaro
[December 14, 2025, 04:44:57 pm]
Running External Tools
by
JuhaManninen
[December 14, 2025, 04:08:28 pm]
Why does the call via fun...
by
jamie
[December 14, 2025, 03:19:59 pm]
The start of yet another ...
by
TBMan
[December 14, 2025, 03:16:21 pm]
Need help with Runcommand...
by
marcov
[December 14, 2025, 12:46:25 pm]
Military Grade Directives
by
Thaddy
[December 14, 2025, 11:46:44 am]
Cannot find Online Packag...
by
Thaddy
[December 14, 2025, 11:37:58 am]
Anyone interested in help...
by
ad1mt
[December 14, 2025, 08:56:20 am]
Hashing pointers by using...
by
440bx
[December 14, 2025, 03:16:33 am]
exception external SIGSEG...
by
dseligo
[December 14, 2025, 02:24:28 am]
[SOLVED] Is this a compil...
by
jamie
[December 14, 2025, 01:46:54 am]
Problem installing LazPro...
by
peter.dell
[December 14, 2025, 01:32:53 am]
AI interactions
by
Joanna
[December 13, 2025, 11:47:24 pm]
project - count source li...
by
bobonwhidbey
[December 13, 2025, 10:30:31 pm]
FPC 3.2.4-rc1 available
by
PeterBB
[December 13, 2025, 08:31:32 pm]
fpsockets error: 10047
by
parcel
[December 13, 2025, 04:03:56 pm]
« previous
next »
Print
Pages: [
1
]
Author
Topic: Messed merge request (Read 989 times)
regs
Jr. Member
Posts: 94
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: 94
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