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.

This SO post goes into how to use git checkout --orphan to create a new branch whose history is totally separate from the "main" one. This other SO post shows how to do something similar with Git ...