From 431268baf78c88e26a2b7e141236574ba1593a02 Mon Sep 17 00:00:00 2001
From: Christian Krause <christian.krause@idiv.de>
Date: Fri, 12 Oct 2018 09:42:39 +0200
Subject: [PATCH] uses simpler branch names in merge
---
basics.html | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/basics.html b/basics.html
index 0a0c57d..5620c89 100644
--- a/basics.html
+++ b/basics.html
@@ -803,8 +803,7 @@
```bash
git remote add alice https://...
git fetch alice
- git checkout master
- git merge alice/topic/feature
+ git merge alice/master
# fix conflicts
git push
```
@@ -813,7 +812,6 @@
```bash
git fetch upstream
- git checkout topic/feature
git merge origin/master
# fix conflicts
git push
@@ -877,7 +875,7 @@
```bash
git remote add alice https://...
git fetch alice
- git rebase master alice/topic/feature
+ git rebase master alice/master
# fix conflicts
git push
# close merge request
@@ -887,7 +885,7 @@
```bash
git fetch upstream
- git rebase origin/master topic/feature
+ git rebase origin/master master
# fix conflicts
# force push because branch history changed
git push --force
--
GitLab