Understanding The Git Flow

Some Git Commands

Let's get to know some basic git commands.

• git init

  The git init command creates a new Git repository. It can be used to convert an existing, unversioned project to a Git repository or initialize a new, empty repository.
• git add The git add command adds a change in the working directory to the staging area. It tells Git that you want to include updates to a particular file in the next commit.
• git commit The git commit command captures a snapshot of the project's currently staged changes. These snapshots are safe versions of a project. Git will never change them unless explicitly asked to.
• git remote The git remote command lets you create, view, and delete connections to other repositories. A remote is a repository that is stored on a code hosting service like GitHub.
• git push The git push command is used to upload local repository content to a remote repository.
• git pull The git pull command is used to fetch and download content from a remote repository and immediately update the local repository to match that content.
• git branch The git branch command lets you create, list, rename, and delete branches.
• git status The git status command is used to display the state of the repository and staging area. It allows us to see the tracked, untracked files and changes.

Git Branch Commands

A branch represents an independent line of development. Branches serve as an abstraction for the edit/stage/commit process. You can think of them as a way to request a brand new working directory, staging area, and project history. New commits are recorded in the history for the current branch, which results in a fork in the history of the project.
The git branch command lets you create, list, rename, and delete branches. It doesn’t let you switch between branches or put a forked history back together again. For this reason, git branch is tightly integrated with the git checkout and git merge commands.

• git branch

  List all of the branches in your repository. This is synonymous with git branch --list.
• git branch <branch> Create a new branch called ＜branch＞. This does not check out the new branch.
• git branch -m <branch> Rename the current branch to ＜branch＞.
• git branch -a List all remote branches.
• git branch -d <branch> Delete the specified branch. This is a “safe” operation that prevents you from deleting if unmerged changes exists.
• git branch -D <branch> Force delete the specified branch, even if it has unmerged changes. This is used if you want to permanently throw away all of the commits.
• git checkout -b ＜new-branch＞ git branch creates a new branch and then you can use git checkout new_branch to switch to that branch. The git checkout command accepts a -b argument which will create the new branch and immediately switch to it. You can work on multiple features in a single repository by switching between them with git checkout.

Git Commands - Useful To Resolve Conflicts

• git status

  The status command is in frequent use when a working with Git and during a merge it will help identify conflicted files.
• git log --merge Passing the --merge argument to the git log command will produce a log with a list of commits that conflict between the merging branches.
• git diff diff helps find differences between states of a repository/files. This is useful in predicting and preventing merge conflicts.
• git checkout checkout can be used for undoing changes to files, or for changing branches
• git reset --mixed Reset can be used to undo changes to the working directory and staging area.
• git merge --abort Executing git merge with the --abort option will exit from the merge process and return the branch to the state before the merge began.
• git reset Git reset can be used during a merge conflict to reset conflicted files to a know good state.