From dd46ba700a9d37979c8f6bc7fd415236775003e3 Mon Sep 17 00:00:00 2001 From: kapmaurya Date: Fri, 1 Nov 2024 21:31:10 +0530 Subject: [PATCH] update readme file with Squashing your Commits --- README.md | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/README.md b/README.md index cf8c1e67b..ae7fd48e5 100644 --- a/README.md +++ b/README.md @@ -37,32 +37,8 @@ Mifos boasts an active and vibrant contributor community, Please join us on [sla ### [**Making a Pull Request**](https://github.com/openMF/mobile-wallet/wiki/Making-a-Pull-Request) -### **Squashing Your Commits** +### [**Squashing Your Commits**](https://github.com/openMF/mobile-wallet/wiki/Squashing-Your-Commits) -It is common for pull requests to undergo multiple rounds of review before being merged. To keep the Git history clean and organized, you should always squash your commits before finalizing the merge. Here's how you can do it: - -1. Squash your commits: - - ```bash - git rebase -i HEAD~x - ``` - - Replace **`x`** with the number of commits you want to squash. An interactive rebase will open, allowing you to choose how to combine the commits. Change **`pick`** to **`squash`** (or simply **`s`**) for all but the topmost commit. Save and exit the editor. - -2. Amend the commit message if needed. - - ```bash - git commit --amend - ``` - -3. Force push the changes to your forked repository: - - ```bash - git push --force origin your-branch-name - ``` - - Please note that force pushing rewrites the Git history, so use it with caution. - ### **Solving Merge Conflicts**