.
Before creating a branch, you first have to choose a base of your branch. Then you can create your branch:
Let's assume your name is me, your branch will be called feature1 and your base will be master.
There are several ways of creating a branch:
-You can simply create it by issuing:
-git branch me/feature1 master
-This will create the branch locally, nothing else. It will not checkout the branch. You can do this now:
+You can simply create it by doing this from the xonotic directory and selecting where to branch:
+./all branch me/feature1
+This will create the branch locally and nothing else. It will not checkout the branch. You can do this now with:
git checkout me/feature1
Another possibility would be to checkout your base, and then use git checkout -b me/feature1. This is usually nice if you already are on your base branch because it is a single command.
@@ -91,7 +91,7 @@ h2. Merging and rebasing
In git you have two ways of combining two branches: You can either merge them, which does exactly what its name suggests: it merges the commits together. Or you can rebase the branch.
-Rebasing means that all your changes will be put at the end. This works by first collecting and removing all your changes, then replacing your branch with the base branch, then applying all your changes to it. Whenever something failes to apply you'll be asked to fix it, and then issue a git rebase --continue
+Rebasing means that all your changes will be put at the end. This works by first collecting and removing all your changes, then replacing your branch with the base branch, then applying all your changes to it. Whenever something fails to apply you'll be asked to fix it, and then issue a git rebase --continue
* Merging master into me/feature1: git checkout me/feature1
git merge master