@@ -33,3 +33,61 @@ You can also download different plugins depending on the IDE you are using for a
For example, if you edited a file, such as README.md, and another person removed the same file in another branch in the same Git repository, you'll get a merge conflict error when you try to merge these branches. You must resolve this merge conflict with a new commit before you can merge these branches.