diff --git a/README.md b/README.md index a5191de..7101317 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,23 @@ The "master" branch should always contain a working/correct version of your proj - Create/change into branches ```shell -git checkout -b -git checkout +# list all branches (highlight active branch) +git banch -a +# switch into existing +git checkout +# switch into new branch +git checkout master +git checkout -b ``` +- remerging with master branch +```shell +git checkout master +git pull origin master +git checkout +git rebase master +``` +This resets you branch to the fork-point, executes all commits of the current master before adding the commits of you +branch. You may have to resolve potential conflicts. Afterwards commit the corrected version and push it to your branch. + +Push changes into master-branch.