diff --git a/README.md b/README.md index 4efe3ee..0afaa26 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Starting your own project with others? Learn about the [Basic Workflow](https:// * [Squashing Commits](#squashing-commits) -* [Fixing PR when other changes get merged leading to conflicts](#avoiding-merge-commits) +* [Fixing PR when other changes get merged leading to conflicts](#fixing-pr-when-other-changes-get-merged-leading-to-conflicts) * [Undoing Commits](#undoing-commits) @@ -176,7 +176,7 @@ The above two instruction will locally squash the number of commits you chose to This is a forced update that makes the remote repository squash the commits into one. -###Fixing PR when other changes get merged before leading to conflicts +###Fixing PR when other changes get merged leading to conflicts This is in continuation with requirement of having a single commit in your PR, suppose you did some work and submitted a PR to the main repository but before your request could be merged, changes were made by other developers in the repository and now your PR presents merge conflicts. You could fetch the work, resolve merge conflicts and push again but that will lead to `MERGE COMMIT` that is undesirable at times. The flow below can be followed to prevent the same: This assumes the following: