I'm not one of the people downvoting this, but that just seems like your git workflow or project structure is lacking.
what's going on that there's two people merging changes to the same file multiple times per day?... having to resolve one small set of conflicts per merge is pretty common, but it it's happening more than that, it sounds like you either need a better PR review process to prevent people needing to make a dozen follow-on merges in quick succession... and/or your project needs to be broken down to either one big function and it's supporting code per file, or a handful of small functions per file...
anything larger than 1000 lines should almost certainly be split into multiple files, and most files should still be half that or less so unless you were both mistakenly assigned the same ticket, you shouldn't be making conflicting changes to the same file very often.
1
u/oneeyedziggy Mar 30 '22
I'm not one of the people downvoting this, but that just seems like your git workflow or project structure is lacking.
what's going on that there's two people merging changes to the same file multiple times per day?... having to resolve one small set of conflicts per merge is pretty common, but it it's happening more than that, it sounds like you either need a better PR review process to prevent people needing to make a dozen follow-on merges in quick succession... and/or your project needs to be broken down to either one big function and it's supporting code per file, or a handful of small functions per file...
anything larger than 1000 lines should almost certainly be split into multiple files, and most files should still be half that or less so unless you were both mistakenly assigned the same ticket, you shouldn't be making conflicting changes to the same file very often.