Skip to content

Commit e91d0ac

Browse files
committed
Update command.txt
1 parent 63e4950 commit e91d0ac

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

gitlab4j-test/command.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,24 @@ git push jmini tag --delete 5.3.0-pr_0000
99

1010
------------------------------------------
1111

12-
git rebase --onto origin/main origin/6.x
12+
git rebase --onto origin/main origin/bbbbb
1313
git push --force
1414

1515
Help message:
1616
-------------
1717

18-
Be aware that your local branch `xxxxx` has diverged with the one on the GitHub.
18+
I have rebased the source branch of this PR (`bbbbb` in the `ffffff` fork) on top of `main` of this repo:
19+
20+
```
21+
git rebase --onto origin/main origin/bbbbb
22+
git push ffffff HEAD:bbbbb --force
23+
```
24+
25+
Be aware that your local branch `bbbbb` has diverged with the one on the GitHub.
1926
If you need to do one more changes on this branch:
20-
I recommend to use `git fetch` and `git reset --hard origin/xxxxx` before doing any local modifications instead of `git pull`.
27+
I recommend to use `git fetch` and `git reset --hard origin/bbbbb` (assuming your local `origin` is pointing to the `ffffff` fork on GitHub) before doing any local modifications instead of `git pull`.
28+
29+
I will change the target branch of this PR to be `main`
2130

2231
------------------------------------------
2332

0 commit comments

Comments
 (0)