mirror of
https://github.com/k88hudson/git-flight-rules.git
synced 2025-03-10 12:48:43 -03:00
Update info how to reset local branch to remote-tracking branch (#344)
This commit is contained in:
parent
3ff35c8642
commit
8413701f30
@ -902,10 +902,10 @@ Confirm that you haven't pushed your changes to the server.
|
||||
#
|
||||
```
|
||||
|
||||
One way of resetting to match origin (to have the same as what is on the remote) is to do this:
|
||||
One way of resetting branch `my-branch` to match `origin/my-branch` (to have the same as what is on the remote) is to do this:
|
||||
|
||||
```sh
|
||||
(main)$ git reset --hard origin/my-branch
|
||||
(my-branch)$ git reset --hard origin/my-branch
|
||||
```
|
||||
|
||||
<a name="commit-wrong-branch"></a>
|
||||
|
@ -514,7 +514,7 @@ Confirma que no ha enviado sus cambios al servidor.
|
||||
Una forma de reiniciar para hacer coincidir el origin (tener lo mismo que lo que está en el control remoto) es hacer esto:
|
||||
|
||||
```sh
|
||||
(main) $ git reset --hard origin / my-branch
|
||||
(my-branch) $ git reset --hard origin/my-branch
|
||||
```
|
||||
|
||||
### Hice commit a main en lugar de una nueva rama
|
||||
|
@ -576,7 +576,6 @@ Assurez-vous que vous n'avez pas poussé vos modifications sur le serveur.
|
||||
`git status` devrait vous indiquer combien de commits en avance vous êtes par rapport à origin :
|
||||
|
||||
```sh
|
||||
(my-branch)$ git status
|
||||
(ma-branche)$ git status
|
||||
# On branch ma-branche
|
||||
# Your branch is ahead of 'origin/my-branch' by 2 commits.
|
||||
@ -587,7 +586,7 @@ Assurez-vous que vous n'avez pas poussé vos modifications sur le serveur.
|
||||
Une des façons de faire pour réinitialiser votre branche afin qu'elle corresponde à origin (afin d'avoir la même chose que le dépôt distant) est de lancer ceci :
|
||||
|
||||
```sh
|
||||
(main)$ git reset --hard origin/ma-branche
|
||||
(ma-branche)$ git reset --hard origin/ma-branche
|
||||
```
|
||||
|
||||
<a name="commit-wrong-branch"></a>
|
||||
|
@ -919,7 +919,7 @@ $ git reset --hard c5bc55a
|
||||
origin と同じ状態にリセットする(リモートと同じ状態にする)方法の一つは次の通りです。
|
||||
|
||||
```sh
|
||||
(main)$ git reset --hard origin/my-branch
|
||||
(my-branch)$ git reset --hard origin/my-branch
|
||||
```
|
||||
|
||||
<a name="commit-wrong-branch"></a>
|
||||
|
@ -547,7 +547,7 @@ $ git reset --hard c5bc55a
|
||||
오리진(리모트과 같은 상태의)로 맞추는 리셋을 하는 방법 중 하나는:
|
||||
|
||||
```sh
|
||||
(main)$ git reset --hard origin/my-branch
|
||||
(my-branch)$ git reset --hard origin/my-branch
|
||||
```
|
||||
|
||||
<a name="commit-wrong-branch"></a>
|
||||
|
@ -807,7 +807,7 @@ $ git reset --hard c5bc55a
|
||||
Один из способов сбросить до источника (чтобы иметь то же, что и в удаленном репозитории):
|
||||
|
||||
```sh
|
||||
(main)$ git reset --hard origin/my-branch
|
||||
(my-branch)$ git reset --hard origin/my-branch
|
||||
```
|
||||
|
||||
<a name="commit-wrong-branch"></a>
|
||||
|
@ -852,7 +852,7 @@ Kiểm tra rằng bạn chưa push các thay đổi của mình đến server.
|
||||
Một cách để reset về origin (để có nhánh giống như trên remote) là chạy lệnh:
|
||||
|
||||
```sh
|
||||
(main)$ git reset --hard origin/my-branch
|
||||
(my-branch)$ git reset --hard origin/my-branch
|
||||
```
|
||||
|
||||
<a name="commit-wrong-branch"></a>
|
||||
|
@ -375,7 +375,7 @@ $ git reset --hard c5bc55a
|
||||
一种方法是:
|
||||
|
||||
```sh
|
||||
(main)$ git reset --hard origin/my-branch
|
||||
(my-branch)$ git reset --hard origin/my-branch
|
||||
```
|
||||
|
||||
<a name="commit-wrong-branch"></a>
|
||||
|
@ -372,7 +372,7 @@ $ git reset --hard c5bc55a
|
||||
一種方法是:
|
||||
|
||||
```sh
|
||||
(main)$ git reset --hard origin/my-branch
|
||||
(my-branch)$ git reset --hard origin/my-branch
|
||||
```
|
||||
|
||||
<a name="commit-wrong-branch"></a>
|
||||
|
Loading…
x
Reference in New Issue
Block a user