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
FPGMAP accepts duplicates...
by
jamie
[
Today
at 01:12:10 pm]
How to read the values ca...
by
dodgex
[
Today
at 11:17:00 am]
TToolbutton: Dropdown men...
by
apeoperaio
[
Today
at 11:16:26 am]
FPC Unleashed (inline var...
by
creaothceann
[
Today
at 10:47:31 am]
Hint tools gives wrong hi...
by
Nicole
[
Today
at 10:43:50 am]
TA Chart Axes visibility ...
by
Nicole
[
Today
at 10:32:35 am]
Scripts to generate ofici...
by
marcov
[
Today
at 09:44:13 am]
Connecting to AzureSQL
by
paweld
[
Today
at 09:31:30 am]
Nothing but chaotic attem...
by
dbannon
[
Today
at 09:25:17 am]
How do 'with' statements ...
by
Thaddy
[
Today
at 09:14:38 am]
Pascal port of Unishox2
by
Okoba
[
Today
at 08:48:45 am]
Can I get the position an...
by
CM630
[
Today
at 08:38:48 am]
Windows API Hooking/DLL I...
by
tooknox
[
Today
at 06:49:16 am]
Can't access class in for...
by
egsuh
[
Today
at 06:44:12 am]
P.I.S.S. a PlugIn-framewo...
by
cdbc
[
Today
at 12:43:49 am]
Qt does not position form...
by
systemgvp
[
Today
at 12:08:36 am]
TBufferDataSet error on a...
by
eldonfsr
[May 11, 2026, 11:24:36 pm]
Work of exeptions, corrup...
by
LemonParty
[May 11, 2026, 09:13:35 pm]
Help with FPReport data b...
by
Dankan1890
[May 11, 2026, 09:05:18 pm]
Full MSVC/LLVM/MinGW COFF...
by
tooknox
[May 11, 2026, 08:27:49 pm]
Limiting Search in TSelec...
by
Bart
[May 11, 2026, 06:45:22 pm]
How to compare floating p...
by
creaothceann
[May 11, 2026, 02:14:30 pm]
Getting name / line of ca...
by
Thaddy
[May 11, 2026, 01:58:46 pm]
Label with multiple lines...
by
paweld
[May 11, 2026, 12:39:49 pm]
[Solved] TStringGrid disp...
by
jcmontherock
[May 11, 2026, 11:30:47 am]
« previous
next »
Print
Pages: [
1
]
Author
Topic: Messed merge request (Read 1118 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