search

arshsisodiya / helios-mirror

Telegram Mirror and Leech Bot
https://t.me/mirrorsociety
GNU General Public License v3.0
389 stars 967 forks source link

cant merge with anas repo due to his shitty useless update ( he wont add the group branch but updated it for no reason) #8

Closed AmirulAndalib closed 2 years ago

AmirulAndalib commented 2 years ago

anas has done a big messy update to his repo and all new features are using his new updates can you please do it aswell so i can merge your repo with anas repo???

https://github.com/AmirulAndalib/AnasToolkit/tree/ee6ed45bb85f03e4f73e7a5958020184dcc36107

starting from that and after commits are present on that update.

AmirulAndalib commented 2 years ago

https://github.com/AmirulAndalib/AnasToolkit/commit/ee6ed45bb85f03e4f73e7a5958020184dcc36107

arshsisodiya commented 2 years ago

see anasty is pro, he knows what he doing, i can cherry-pick all new commits of anasty's repo if i want, it will just take me few hours to solve all merge conflicts maybe 5-6 hours, but if i do that i have to redeploy all my bots and everyone using my repo also have to do the same, that's why i'm not merging with anasty's latest commits, and it doesn't make any sense to put that much efforts in picking all his latest commits cause all things are same.

AmirulAndalib commented 2 years ago

Not same sir some important changes there too if not can you privately help me ?? Thanks

arshsisodiya commented 2 years ago

Not same sir some important changes there too if not can you privately help me ?? Thanks

i don't find any latest change important or that much useful, and i can;t help its simple if you cherry pick you will have merge conflicts and you have to solve them, simple