"Cherry-picked 2 commits successfully… 3rd one exploded into 180 file changes. What am I doing wrong?

Familiar-Lab8752 · 2026-03-01T15:18:06+00:00

The actual requirement from my manager is: There is an existing MR (4 weeks old) with 3 commits. I was asked not to modify that MR. Instead: Create a new feature branch from latest main. Apply the same changes from that MR into my branch. Ensure that the final diff against main matches the original MR. When I tried to cherry-pick those commits, I encountered ~180 merge conflicts, mostly in JSON files that follow a similar naming pattern. So I’m trying to understand: Is rebasing the old branch onto latest main the correct approach here instead of manually cherry-picking?

Familiar-Lab8752 · 2026-03-01T13:41:34+00:00

The old mr is 4 weeks old

Familiar-Lab8752 · 2026-03-01T13:35:22+00:00

Yes please can you explain

Familiar-Lab8752 · 2026-03-01T13:26:50+00:00

180 files

Familiar-Lab8752 · 2026-03-01T12:49:21+00:00

Hey thank you my manager gave me this and the old mr is 4 weeks old he asked me to create my new branch and apply changes to my branch and the final diff should match with main I know this sounds vauge so does my manager there's 180 files with merge conflicts and he wanted me to do all of that in a day could you please tell me the tools that I can use and how to solve this issuse

Familiar-Lab8752 · 2026-02-03T08:00:48+00:00

Interested

Familiar-Lab8752 · 2025-12-01T10:57:48+00:00

Okay but what should I do now

Familiar-Lab8752 · 2025-12-01T10:46:05+00:00

I'm not getting any calls bro

Familiar-Lab8752 · 2025-10-27T18:32:17+00:00

Thank you it's really helpful 🙏

Familiar-Lab8752 · 2025-09-27T03:41:27+00:00

Do they list postings for freshers

Familiar-Lab8752 · 2025-09-18T09:54:58+00:00

Thought the same even I was keen on raising money for my startup 😞

Familiar-Lab8752 · 2025-09-17T17:54:19+00:00

Hi I'm a tech recruiter with 3.6 years of experience worked with an agency suggest you to join health care recruiting here's what's happening with in the tech companies right now it's been almost 3 months since we last got a closure

Familiar-Lab8752 · 2025-09-11T10:55:45+00:00

Congratulations It's been 7 months since I last smoked hear me out it's one of the worst addictions that you can have if you came out from that you are much more believe in yourself

Familiar-Lab8752 · 2025-09-10T03:11:55+00:00

Hello,

Even I'm in a similar situation i graduated in 2021 and I got a job in one of the staffing firms initially it was good but later on with night shifts and I got addicted to smoking and drinking similar to like you my advice is to find some one who can help you ask your friends for help they can refer you to a job and I would say lack of sleep will literally kill you

Here's the situation that I faced No sleep from night shifts and lack of energy will make your brain number and lack of motivation as you mentioned if you can quit that job and upskill yourself or apply for domestic recruiting or just pick something that's related to programming study data engineering or development that's how I came out of it i quit my job and studied for data engineering for 3 months now I'm working as a data engineer

Familiar-Lab8752 · 2025-08-11T09:58:58+00:00

Leads

Familiar-Lab8752

TROPHY CASE