GitHub new account

[Joshua-Dawkins]

When working on a long-lived feature branch, should I squash commits or rebase before merging, and how do I avoid breaking CI/CD?

[arthurrochamoreira]

For a long-lived feature branch, the best practice is to rebase frequently against the main branch to resolve conflicts in small increments and then squash your commits during the final merge to maintain a clean, linear history. To avoid breaking CI/CD, ensure your branch is fully updated with the latest production code and passes all automated pipelines before merging, while using feature flags to safely integrate large changes without prematurely exposing them to users.