Cannot find a best and safe way for merging local branch into master? Check this tutorial which opens up the right method you need for solving this problem.
In this tutorial, you will get an answer to your problem of fetching the local and remote branches with the simplest way using Git most used commands.
This tutorial will show you how to force git pull in case of untracked files which will be overwritten. Find important tips to avoid unwanted mistakes.
In this tutorial, you will get an answer to your problem of managing multiple projects into a single repository step by step with the most used commands.
Learn more about git submodules in this short tutorial. Here you will also find out how to pull the latest git submodule in a relatively fast and easy way.
Read this tutorial and solve the problem of resolving git merge conflicts in favor of pulled changes. Get overall understanding of Git merge strategies.