0
我做了一个简单的git fetch --all --prune以从master获取修改，然后我做了git pull。Git push -f rebase修改后的2个分支
之后，我又回到另一个分支来重新设置git rebase master。之后，这一切似乎工作。
但我去做了git push -f发送这个修改遥远的Gitlab，git推到我的rebase分支和另一个分支，我甚至没有触及一周。 这是第一次做git。
有git的痕迹
➜ n-admin git:(master) ✗ git fetch --all --prune
Fetching origin
git remote: Counting objects: 55, done.
remote: Compressing objects: 100% (54/54), done.
remote: Total 55 (delta 16), reused 0 (delta 0)
Unpacking objects: 100% (55/55), done.
From git.foo.net:foo/project
d626c2e..928ac1b master -> origin/master
+ 206f658...177ea93 llb-design -> origin/llb-design (forced update)
➜ n-admin git:(master) ✗ git pull
Updating d626c2e..928ac1b
Fast-forward
docker-compose.override.yml.dist
src/AppBundle/foo/bar.php
src/AppBundle/Controller/fooController.php
src/AppBundle/Form/DataTransformer/fooTransformer.php
4 files changed, 72 insertions(+), 7 deletions(-)
create mode 100644 src/AppBundle/Command/barCommand.php
➜ n-admin git:(master) ✗ git co my-branch
Switched to branch 'my-branch'
Your branch is up-to-date with 'origin/my-branch'.
➜ n-admin git:(my-branch) ✗ git rebase master
First, rewinding head to replay your work on top of it...
Applying: foo1
Applying: foo2
Applying: foo3
➜ n-admin git:(my-branch) ✗ git push -f
git Counting objects: 188, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (160/160), done.
Writing objects: 100% (188/188), 19.99 KiB | 0 bytes/s, done.
Total 188 (delta 143), reused 29 (delta 18)
co mremote:
remote: View merge request for llb-design:
remote: https://git.foo.net/foo/bar/merge_requests/494
remote:
remote: View merge request for my-branch:
remote: https://git.foo.net/foo/bar/merge_requests/502
remote:
To [email protected]:foo/bar.git
+ 177ea93...206f658 llb-design -> llb-design (forced update)
+ ba2a2b6...7734353 my-branch -> my-branch (forced update)
你有关于这个奇怪的事情一样线索？我是否错过/失败