From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <real@kemsu.ru>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham
	version=3.2.5
Message-ID: <5085247F.20307@kemsu.ru>
Date: Mon, 22 Oct 2012 17:48:31 +0700
From: REAL <real@kemsu.ru>
User-Agent: Mozilla/5.0 (X11; Linux i686;
	rv:10.0.2) Gecko/20120302 Thunderbird/10.0.2
MIME-Version: 1.0
To: ALT Linux Sisyphus discussions <sisyphus@lists.altlinux.org>
References: <50841617.1040207@diyaorg.dp.ua>
	<3103452.6bL35u3Gs6@summoner.localdomain>
In-Reply-To: <3103452.6bL35u3Gs6@summoner.localdomain>
Content-Type: text/plain; charset=KOI8-R; format=flowed
Content-Transfer-Encoding: 8bit
Subject: Re: [sisyphus] =?koi8-r?b?8M/LwdbJ1MUg0NLB18nM2M7PxSDSxdvFzsnFIM/b?=
 =?koi8-r?b?ycLLyTogdGFnIGA/Pz8nIGlzIG5vdCBpbmhlcml0ZWQgZnJvbSA/Pz8=?=
X-BeenThere: sisyphus@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: ALT Linux Sisyphus discussions <sisyphus@lists.altlinux.org>
List-Id: ALT Linux Sisyphus discussions <sisyphus.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/sisyphus>,
	<mailto:sisyphus-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/sisyphus>
List-Post: <mailto:sisyphus@lists.altlinux.org>
List-Help: <mailto:sisyphus-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/sisyphus>,
	<mailto:sisyphus-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2012 10:45:41 -0000
Archived-At: <http://lore.altlinux.org/sisyphus/5085247F.20307@kemsu.ru/>
List-Archive: <http://lore.altlinux.org/sisyphus/>
List-Post: <mailto:sisyphus@altlinux.ru>

22.10.2012 17:39, Sergey V Turchin пишет:
> On 21 октября 2012 18:34:47 Roman Savochenko wrote:
>
> [...]
>> - git remote add gears git://git.altlinux.org/gears/k/kdeaddons.git
>> - git merge -s ours git://git.altlinux.org/gears/k/kdeaddons.git
> git merge gears/sisyphus
> (без ours), исправить конфликты и сделать commit -a

А перед merge не забыть
git remote update

-- 

REAL aka Евгений Ростовцев, программист ЦНИТ КемГУ