- About.
- Documentation.
- Git Commands.
- The .gitignore File.
- Platforms.
- Graphical User Interfaces Clients (GUI).
- Articles.
- Merge Conflict.
- Help.
-
You can list files/directories that you want to explicitely exclude from Git in a
.gitignorefile. This file should be placed at the root of your repository.
The following platforms can be used to host your Git repositories.
| NAME | PRICE |
|---|---|
| Github | Free |
| Gitlab | Free |
| Bitbucket | Free |
Is the command-line not for you? Try one of the following GUIs.
| NAME | OS | PRICE |
|---|---|---|
| Github | Mac and Windows | Free |
| Source Tree | Mac and Windows | Free |
| Tower | MacOS and Windows | 59 USD per year |
- Learn Git concepts, not commands
- Syncing a Fork
- Flight rules for Git - What to do when things go wrong...
- Git Flow
What is Merge Conflict?
- A merge conflict is a event that take place when Git is unable to resolve differences in code between the two commits automatically.
- Git can automatically merge the changes only if the commits are not different lines or branches.
Type of Merge Conflict. There are two points when a merge can enter a conflict state.
- Starting the merge process:
- If there are changes in the working directory of the stage area of the current project, merge will fail to start.
- In this case conflict happen due to pending changes which needs to be stabilized using different git commands.
- During the merge process:
- The failure during the merge process indicate that there is a conflict between the local branch and the branch being merged.
- In this case git resolves as much as possible but there are things that have to be resolved manually in the conflict file.