I'm working on a project where I've successfully cherry-picked two commits into a new branch, but I'm having a tough time with the third one. This last commit is causing a huge mess with around 180 file changes involved, many of which have similar names, and some need manual editing. I'm really worried about missing some changes or introducing errors into the code. I've already tried creating a new branch, cherry-picking one commit at a time, manually resolving conflicts, and reviewing changes in VS Code before staging them. I'm unsure if this is the right way to handle so many files. Is it normal to cherry-pick commits that involve over 100 file changes? What's a safer method to manage bulk updates? Should I commit all changes at once or in separate batches? Are there any tools or automation techniques I should consider? I'm eager to improve my workflow, so I'd love any advice you can offer. Thanks!
3 Answers
When you're dealing with a third commit affecting that many files, it’s likely better to evaluate how essential those changes really are. Instead of cherry-picking, consider applying the changes directly if they're simple enough. If you see that those 180 files are indeed necessary, you just need to tackle the merge conflicts. It's useful to communicate with the dev who made those changes to figure out what needs to stay or if you'll need to merge both changes together. If those changes are older, you might want to treat your updates as priority!
You're right to be cautious. When a commit touches so many files, it can get overwhelming fast! Ideally, cherry-picking is used when you really need specific changes out of order, and it sounds like your manager's expectations might not match the complexity. For handling this, try using GUI tools like Sourcetree or GitKraken to visualize changes and conflicts better. Don't hesitate to ask for additional time if 180 files in a day feels impossible!
Honestly, a situation with changes to that many files isn't super common unless the commit was massive. If the commits are just out of sync, you might be better off doing a manual rebase instead of cherry-picking. In terms of tools, if your repository is well-tested, AI tools can help handle some of those merge conflicts smoothly. Often, Git can manage cherry-picks and rebases without much fuss—if there are no conflicts.
Related Questions
How To: Running Codex CLI on Windows with Azure OpenAI
Set Wordpress Featured Image Using Javascript
How To Fix PHP Random Being The Same
Why no WebP Support with Wordpress
Replace Wordpress Cron With Linux Cron
Customize Yoast Canonical URL Programmatically