diff options
| author | Ekaitz Zarraga <ekaitz@elenq.tech> | 2022-06-10 15:10:00 +0200 |
|---|---|---|
| committer | Ekaitz Zarraga <ekaitz@elenq.tech> | 2022-06-10 15:10:00 +0200 |
| commit | 5b8dc1c788ad3d5718433bebfbacfda2ab0f35a2 (patch) | |
| tree | 24a3273c0d6705fce7bb470b2aa913cc31927ae1 /2.md | |
| parent | 3a168c5b085471853ffa590721fa3a73fa596dc5 (diff) | |
Mention `merge-base`
Diffstat (limited to '2.md')
| -rw-r--r-- | 2.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -438,7 +438,7 @@ galdu barik. Konfliktoetan Gitek 3 fitxategi ematen ditu: 1. Stage 1: *common ancestor*-a (*base*), bi adarretatik iritsi daitekeen - lehengo commita + lehengo commita: `git merge-base`-ekin lortu daiteke puntu hau 2. Stage 2: Gure (*ours*) bertsioa, gure adarrean dagoena 3. Stage 3: Haien (*theirs*) bertsioa, mergeatzen dugun adarrean dagoena |