diff --git a/README.md b/README.md index cc03d1c..3fcf992 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,12 @@ * [Squashing Commits](#squashing-commits) -* [Avoiding Merge Conflicts](#avoiding-merge-commits) +* [Avoiding Merge Commits](#avoiding-merge-commits) * [Undoing Commits](#undoing-commits) +* [Merge Conflicts - why and how to remove](#merge-conflicts) + To learn about basic workflow when working on collaborative projects, read the common terms below and follow [this](https://github.com/chhavip/Git-Guide/blob/master/Basic%20Workflow.md).