From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=BAYES_00, DNS_FROM_AHBL_RHSBL, RP_MATCHES_RCVD autolearn=no autolearn_force=no version=3.4.0 Message-ID: <5523834F.3050501@kemsu.ru> Date: Tue, 07 Apr 2015 14:12:15 +0700 From: REAL User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: ALT Linux Team development discussions References: <201503152233.40496@ruslandh> <201504070939.57040@ruslandh> <55237EA5.60205@kemsu.ru> <201504071008.50670@ruslandh> In-Reply-To: <201504071008.50670@ruslandh> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [devel] git X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 07:12:18 -0000 Archived-At: List-Archive: List-Post: 07.04.2015 14:08, Hihin Ruslan пишет: >>> $ git merge gears/sysyphus -s ours -m "Fake merge with >>> gears" merge: gears/sysyphus - not something we can merge >> >> Значит, нет такого бранча. Покажите вывод >> git branch -a > > $ git branch -a [...] > remotes/gears/sisyphus Странно, бранч на месте. Не знаю, что и думать. -- REAL aka Евгений Ростовцев, программист ЦНИТ КемГУ