Introduction: Git, as the most popular distributed version control system, is an essential tool for developers. However, there are some common problems that even experienced developers often encounter. This blog will introduce some commonly used Git commands and provide guidelines for solving common problems, hoping to help readers use Git better and avoid some common mistakes.
1. Git common commands
- git init: Initialize the current directory as a Git repository.
- git clone [url]: Clone the remote warehouse to the local.
- git add [file]: Add files to the temporary storage area.
- git commit -m "message": Submit the files in the temporary storage area to the local warehouse, and add relevant submission information.
- git push: Push the changes of the local branch to the remote warehouse.
- git pull: Get the latest changes from the remote warehouse and automatically merge them into the local branch.
- git branch: List all branches.
- git checkout [branch]: switch to the specified branch.
- git merge [branch]: Merge the changes of the specified branch into the current branch.
- git fetch: Download the latest changes from the remote warehouse, but do not merge them into the local branch.
- git stash: Store the current changes for temporary switching to other branches.
- git reset [commit]: Roll back to the specified commit and discard the changes after that commit.
2. Common problem solving guide
-
Conflict occurs: Solution: Use the git status command to view conflicting files, manually modify the conflict in the file and submit the modification. You can use the git mergetool command to assist in resolving conflicts.
-
Commit information error: Solution: Use the git commit --amend command to modify the information of the latest commit.
-
Accidentally deleted files: Solution: Use the git checkout command to restore accidentally deleted files or directories.
-
Merge the wrong branch: Solution: Use the git reflog command to view the historical operation records, find the commit ID of the merged wrong branch, and then use the git reset command to roll back to the correct state.
-
The remote branch is out of sync with the local branch: Solution: Use the git branch -u origin/[branch] command to associate the local branch with the remote branch, and use the git pull command to merge changes from the remote branch into the local branch.
-
Git submission rejected: Solution: It may be because other people have pushed some changes, you need to use the git pull command to get the latest changes, and manually resolve the conflict before pushing.
-
Submitted sensitive information: Solution: Use the git filter-branch command or the git amend command to modify the commit history to ensure that the sensitive information no longer exists.
Conclusion: This blog introduces some commonly used Git commands and guidelines for solving common problems. Mastering these commands and solutions can help developers use Git better and avoid some common mistakes. However, there are many kinds of Git commands and problem-solving methods. This article is just a simple introductory guide. Readers are recommended to further study and explore according to their own needs. Hope this blog is helpful to readers!