4 ms·
Git Rerere
- bqmjjx0kac 3y agoThat's neat, but I know that I cannot be trusted with this feature.
- hoten 3y agoSo... Is this feature for this kind of workflow: Branch A from main, make a change X. Branch B from main, make a change Y. X and Y happen to have a common subset, call it Z. Someone changes code that effects Z and pushes to main. You are on your branch A and merge main. You resolve the conflict. Now you go to branch B and merge main. Having had enabled rerere, git will notice the same conflict occured and present you with it. Is that right?