test / тест
Let’s first consider the basic example where you want to integrate a feature branch with master. By merging, we create a new commit g that represents the merge between the two branches. The commit graph clearly shows what has happened, and we can see the contours of the «train track» graph familiar from larger Git-repos.
Alternatively, we could rebase before merging. The commits are removed and the feature branch is reset to master, after which the commits are re-applied on top of feature. The diffs of these re-applied commits are usually identical to their original counterparts, but they have different parent commits, and hence different SHA-1 keys.
We have now changed the base commit of feature from b to c, literally re-basing it. Merging feature to master is now a fast-forward merge, because all commits on feature are direct descendants of master.
Alternatively, we could rebase before merging. The commits are removed and the feature branch is reset to master, after which the commits are re-applied on top of feature. The diffs of these re-applied commits are usually identical to their original counterparts, but they have different parent commits, and hence different SHA-1 keys.
We have now changed the base commit of feature from b to c, literally re-basing it. Merging feature to master is now a fast-forward merge, because all commits on feature are direct descendants of master.
Оглавление:
| Название | Статус | Активность | Готово | |
|---|---|---|---|---|
| ф | переводится | > 1 года | 100% (3 / 3) | читать |
| http3 | переводится | > 1 года | 85.7% (6 / 7) | читать |
Перевод
- Перевод:
- текст с английского на русский
- Создан:
- 22 ноября 2018, владелец: akkuraten
- Права доступа:
-
войти все видеть чужие версии группа скачивать результат группа оценивать перевод группа комментировать перевод группа переводить группа читать блог группа комментировать блог группа писать в блог группа анонсировать модераторы редактировать оригинал модераторы редактировать описание никто управлять группой модераторы Участие в группе по приглашению от модераторов - Готово:
-
90.00% КП = 1.3