Git is an amazing tool to merge different branches of code. Most of the time the changes made by you and your team are merged automatically, but from time to time, conflicts occur. In this article, you will learn how to resolve these conflicts and how to prevent them from happening.
Until you "push" local changes, they are only available to you, and there are a few different ways to revert changes in a Git repository. In this article, I will talk about how to undo local changes before committing.
Often the folder hierarchy is important in our projects and we need to create empty folders in the repository. Many developers eventually discover the problem when they deploy to the server and notice that the folders have not been added to the commit.
From time to time we end up accumulating several branches in our repositories. Here's a tip on how to delete a branch both locally and remotely.
Learn how to rename branches in Git the right way. According to the documentation, to rename a local branch in git there is only one command: git branch -m "new-name". But learn the right convention.
The git fetch command can be used to download all commits from the remote repository without affecting your local code. Basically, git pull does first a git fetch followed by a git merge origin/master.
