About Git rebase→
git rebase command allows you to easily change a series of commits, modifying the history of your repository. You can reorder, edit, or squash commits together.
Using Git rebase on the command line→
Here's a short tutorial on using
git rebase on the command line.
Resolving merge conflicts after a Git rebase→
When you perform a
git rebase operation, you're typically moving commits around. Because of this, you might get into a situation where a merge conflict is introduced. That means that two of your commits modified the same line in the same file, and Git doesn't know which change to apply.
About Git subtree merges→
If you need to manage multiple projects within a single repository, you can use a subtree merge to handle all the references.
Splitting a subfolder out into a new repository→
You can turn a folder within a Git repository into a brand new repository.