search

Ctrlpanel-gg / panel

CtrlPanel offers an easy-to-use and free billing solution for all starting and experienced hosting providers that seamlessly integrates with the Pterodactyl panel.
https://ctrlpanel.gg/
MIT License
408 stars 146 forks source link

fix: Conflict Resolution, Merge Main to Development #964

Closed S0ly closed 3 weeks ago

S0ly commented 4 months ago

This PR aims to resolve all conflicts between the main and dev branches by merging all beneficial changes from main into dev. This ensures no features are lost when dev is released as main.

Warning: Only experienced contributors should handle this, as careful conflict resolution is crucial.

Thank you !

S0ly commented 2 months ago

any news on this ?

1day2die commented 2 months ago

we will do this when dev is ready

1day2die commented 2 months ago

actually, looking at this i have no fucking clue whats going on. Cant we just force the dev branch into main once release-ready?

the last 15 commits to the main branch were mainly 3 simple hot fixes and version number. This could be implemented way more easy than resolving 265 conflicts

S0ly commented 2 months ago

this is a very bad idea but you do what you want lol

S0ly commented 2 months ago

next time never push to main instread of dev lol

S0ly commented 3 weeks ago

no one wants to make it so I guess we will blindly erase the main branch

AGuyNamedJens commented 3 weeks ago

I mean.. why merge if dev branch has a lot of new features :D