From: Sergey Afonin <asy@altlinux.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] Q: git и методика объединения c репозитарием с кучей конфликтов.
Date: Thu, 22 Mar 2012 01:05:46 +0400
Message-ID: <16661100.9jeJ1R7qT0@asy-nb.localdomain> (raw)
In-Reply-To: <4F6A3332.5090409@altlinux.org>
On Wednesday 21 of March 2012 23:59:46 Paul Wolneykien wrote:
> > количество "Merge conflict" несколько десятков. Тоскливо как-то руками
> > разруливать. Есть, видимо, вариант просто распаковать туда, поверх
> > вссего этого, тарбол с 4.8.2, но как-то, тоже, не очень здорово выглядит.
> Т.е. хочется сделать так, чтобы была в чистом виде новая версия, без
> смерживания, как такового?
Да.
> Тогда git merge -s recursive -X theirs
Спасибо, оно самое. Правда осталось два конфликта другого типа:
CONFLICT (rename/rename): Rename "lib/vfs/mc-vfs/extfs/ucab"->"lib/vfs/mc-vfs/extfs/ucab.in" in branch "HEAD" rename "lib/vfs/mc-vfs/extfs/ucab"->"src/vfs/extfs/helpers/ucab.in" in "4.8.2"
CONFLICT (modify/delete): lib/vfs/mc-vfs/Makefile.am deleted in 4.8.2 and modified in HEAD. Version HEAD of lib/vfs/mc-vfs/Makefile.am left in tree.
--
С уважением, Сергей Афонин
next prev parent reply other threads:[~2012-03-21 21:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 19:57 Sergey Afonin
2012-03-21 19:59 ` Paul Wolneykien
2012-03-21 21:05 ` Sergey Afonin [this message]
2012-03-23 11:44 ` Sergey Y. Afonin
2012-03-23 11:45 ` Michael Shigorin
2012-03-23 12:02 ` Sergey Y. Afonin
2012-03-23 12:17 ` Michael Shigorin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16661100.9jeJ1R7qT0@asy-nb.localdomain \
--to=asy@altlinux.ru \
--cc=devel@lists.altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git