Conflicts happen. Handle them systematically.

When you hit a conflict:

1. Pull latest from main
2. Rebase your branch: git rebase main
3. Resolve conflicts file by file
4. Test thoroughly after resolving
5. Force push your branch: git push --force-with-lease

Prevention: Merge main into long-running branches regularly. Better yet, keep branches short-lived.