Monorepo Management with Git – Best Practices and Workflows: Difference between revisions
| Line 359: | Line 359: | ||
=== 7.1 Merge conflicts across modules === | === 7.1 Merge conflicts across modules === | ||
'''Why it happens''' Two branches touched the same files or shared APIs changed without coordination. | '''Why it happens''' | ||
Two branches touched the same files or shared APIs changed without coordination. | |||
'''Fix (step by step)''' | '''Fix (step by step)''' | ||
| Line 382: | Line 384: | ||
<span id="sparse-checkout-sync-issues"></span> | <span id="sparse-checkout-sync-issues"></span> | ||
=== 7.2 Sparse-checkout sync issues === | === 7.2 Sparse-checkout sync issues === | ||