From 5b8dc1c788ad3d5718433bebfbacfda2ab0f35a2 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 10 Jun 2022 15:10:00 +0200 Subject: Mention `merge-base` --- 2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '2.md') diff --git a/2.md b/2.md index 058dd23..beae4d7 100644 --- a/2.md +++ b/2.md @@ -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 -- cgit v1.2.3