What are some examples of Git branch commands?

What are some examples of Git branch commands?

Git branch commands are used to manage branches in a Git repository. Here are a few examples:

1. git branch - Lists all branches in the repository.
2. git branch <branch-name> - Creates a new branch.
3. git checkout <branch-name> - Switches to the specified branch.
4. git merge <branch-name> - Merges the specified branch into the current branch.
5. git branch -d <branch-name> - Deletes the specified branch.

Can you explain how to merge branches?

Sure! To merge branches, first switch to the branch you want to merge into using git checkout <target-branch>. Then, use git merge <source-branch> to merge the source branch into the target branch. If there are no conflicts, the merge will complete successfully.

What should I do if there are merge conflicts?

If there are merge conflicts, Git will notify you. You'll need to manually resolve the conflicts in the affected files. After resolving, use git add <file> to stage the changes, and then run git commit to complete the merge.

How can I see the history of my branches?

You can view the history of your branches using the command git log --oneline --graph --all. This will show a visual representation of all branches and their commit history.