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
val return code
by
ALLIGATOR
[
Today
at 01:40:21 pm]
Lazarus 4.6 may erase you...
by
marcov
[
Today
at 12:20:12 pm]
Help needed on how to do ...
by
cdbc
[
Today
at 12:15:15 pm]
PascalRAL the fastest, mo...
by
Mobius1
[
Today
at 11:24:00 am]
TDateTimePicker - Make th...
by
AlexanderT
[
Today
at 09:57:05 am]
TCollection wiki entry
by
Thaddy
[
Today
at 05:44:53 am]
I have made some progress...
by
onionmixer
[
Today
at 04:17:27 am]
equivalent to C/C++ "offs...
by
creaothceann
[
Today
at 12:50:49 am]
UI app to work with SQLit...
by
LeP
[
Today
at 12:50:04 am]
Elite Arcade
by
Guva
[July 11, 2026, 11:25:29 pm]
Freepascal
by
marcelomaurinmartins@gmai
[July 11, 2026, 11:24:44 pm]
International Pascal Cong...
by
vincococka
[July 11, 2026, 11:18:49 pm]
Printing on HP Smart Tank
by
JerryHudson
[July 11, 2026, 10:22:12 pm]
Why is my program freezin...
by
paweld
[July 11, 2026, 07:19:46 pm]
is there PDS reader/expor...
by
jamie
[July 11, 2026, 07:01:12 pm]
Fpcupdeluxe
by
cdbc
[July 11, 2026, 06:40:29 pm]
weird error message
by
jamie
[July 11, 2026, 06:37:01 pm]
Como compilar uma lib par...
by
marcelomaurinmartins@gmai
[July 11, 2026, 06:24:51 pm]
Desenvolvimento visual pa...
by
marcelomaurinmartins@gmai
[July 11, 2026, 06:19:16 pm]
OpenDocument('Filename') ...
by
J-G
[July 11, 2026, 06:13:03 pm]
TTL Record Count, i.e. a ...
by
1HuntnMan
[July 11, 2026, 06:05:29 pm]
Using callback
by
LemonParty
[July 11, 2026, 05:43:15 pm]
Source Editor Collapsed P...
by
J-G
[July 11, 2026, 11:17:14 am]
Habari STOMP Clients for ...
by
mjustin
[July 11, 2026, 11:15:54 am]
Questions on slight diffe...
by
egsuh
[July 11, 2026, 09:45:30 am]
« previous
next »
Print
Pages: [
1
]
Author
Topic: Messed merge request (Read 1125 times)
regs
Jr. Member
Posts: 99
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: 99
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