How do I squash my last N commits together?

To squash multiple commits into a single commit in Git, you can use the interactive rebase feature. Here's a step-by-step guide:

1. Open your terminal.

2. Navigate to your Git repository using the cd command:

cd path/to/your/repository        

3. Start an interactive rebase by running the following command:

git rebase -i HEAD~N        

Replace N with the number of commits you want to squash. For example, if you want to squash the last 5 commits, use HEAD~5.

4. Your default text editor will open with a list of commits and their corresponding actions. Each line represents a single commit and starts with the word "pick". To squash commits, change "pick" to "squash" (or just "s") for all commits except the first one.

5. Save and close the editor.

6. Another editor will open to allow you to edit the commit message of the new squashed commit. Edit the message if needed, save, and close the editor.

7. Git will now squash the selected commits into a single commit with the updated message.

8. If you encounter any conflicts during the rebase process, Git will pause and allow you to resolve them. After resolving conflicts, continue the rebase process by running git rebase --continue.

9. Once the rebase is complete, you may need to force push the changes to your remote repository if you've already pushed the commits you're squashing:

git push --force        

That's it! You've successfully squashed multiple commits into a single commit in Git. Make sure to use this command with caution, especially if you've already pushed your commits to a shared repository, as it rewrites history.