Learn how to merge two branches in Git. There are multiple ways to merge code in Git, including the Merge command and Pull Request.

Learn how to resolve Merge Conflicts in Git using this guide. Merge Conflicts can occur if the same parts of code are changed in different branches.

Learn GitHub basics with this beginner's guide! Master repositories, branches, commits, and pull requests to streamline your coding projects.

Git watches over your whole folder, but changes you make to files are not tied to a specific Git branch until you commit them. You can move branches, and bring those changes along with you.

Jack Wallen shows you how to add a GitHub shortcut to a Jira project so you can view information about branches, commits and pull requests.

Rebase GitHub branches and commits tutorial Developers should be aware of a few caveats when they rebase GitHub repositories, especially when they work on a protected branch like master. In this ...

Need to git clone a single, specific branch? In this quick example, we show you how to git clone a specific branch to help save your builds time and space.

Another way to make merges, and subsequent commits, less noisy is by using the --squash option in git merge. --squash takes all the commits from an incoming branch and flattens them into a single ...