How to merge branches in Git?

@scotty_walker 

To merge branches in Git, you can follow these steps:

1. Switch to the branch where you want to merge the changes. Use the command git checkout
2. Run the command git merge
3. If there are no conflicts, Git will automatically merge the changes and create a new commit. This commit will have a message indicating the branch it was merged from.
4. If there are conflicts, Git will pause the merge and you will need to resolve the conflicts manually. Open the files with conflicts, look for the conflict markers (<<<<<, >>>>>, =====), and modify the code to resolve the conflicts. Save the changes.
5. After resolving the conflicts, add the modified files with git add
6. Run git commit to create a merge commit with the resolved conflicts. Git will automatically create a default merge commit message, but you can modify it if needed.
7. To complete the merge, run git push to push the changes to the remote repository.

Note: It is recommended to perform a git pull before merging to ensure you have the latest changes from the remote repository. Additionally, it is a good practice to merge branches with a clean working directory to avoid unexpected conflicts.