From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <real@kemsu.ru>
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: <55237EA5.60205@kemsu.ru>
Date: Tue, 07 Apr 2015 13:52:21 +0700
From: REAL <real@kemsu.ru>
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 <devel@lists.altlinux.org>
References: <201503152233.40496@ruslandh> <201504070839.25323@ruslandh>
 <552371BB.8070304@kemsu.ru> <201504070939.57040@ruslandh>
In-Reply-To: <201504070939.57040@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 <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Apr 2015 06:52:23 -0000
Archived-At: <http://lore.altlinux.org/devel/55237EA5.60205@kemsu.ru/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

07.04.2015 13:39, Hihin Ruslan пишет:
> $ git merge gears/sysyphus  -s ours -m "Fake merge with gears"
> merge: gears/sysyphus - not something we can merge

Значит, нет такого бранча. Покажите вывод
git branch -a

-- 

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