我是个傻瓜。。。我想回到92e4013f73,并消除我在进行多次git拉取时犯下的所有错误。
* b9a908ea64 (origin/this_variable) Merge branch 'foo-bar:dev' into this_variable
|
* 1a3611f735 Merge branch 'foo-bar:dev' into this_variable
|
* e8044a33fa Merge branch 'foo-bar:dev' into this_variable
|
* 6e9fe81632 Merge branch 'foo-bar:dev' into this_variable
|
* e656766969 Merge branch 'foo-bar:dev' into this_variable
|
* | | | | | d36c348ac4 (HEAD -> dev) Add this variable
| | | | | | * 3f0736c13b (origin/entity_id_template) Merge branch 'foo-bar:dev' into entity_id_template
| | | | | | |
| | | | | | |/
| | | | | |/|
| | | | | * | 92e4013f73 (origin/save_persistent_states, origin/dev, origin/HEAD) Fix siren turn on parameter filtering (#52947)
| | | | | * | 6723942bf8 [ci skip] Translation update
如果您没有任何正在进行的工作,您可以简单地将this_variable
分支重置为dev,然后从那里重试您的工作/合并
再次假设:
- 您当前没有正在修改的文件(否则它们的本地修改将丢失(
- 您是唯一一个处理
this_variable
的人(允许您强制将其推回到原点(
cd /path/to/repo
git switch this_variable
git reset --hard dev
git push --force