From: picca <picca@synchrotron-soleil.Fr>
To: git@vger.kernel.org
Subject: newby question about merge.
Date: Tue, 15 May 2007 11:38:20 +0200 [thread overview]
Message-ID: <20070515113820.2621c8d5@localhost.localdomain> (raw)
Hello I am using git to deal with debian packages.
So i have two Branches the "upstream" one with the different version of
the programm I am packaging.
exemple with two tags
scigraphica/2.1.0
scigraphica/0.8.0
I have another branch the master one which is the upstream + the debian
directory.
So I do a merge like this
"git merge upstream ." when I am on the master branch to work on the new
package.
Everything is fine until git merge the configure scripts. (autotools)
there is conflict with the configure file of the 0.8.0 version during
the last merge.
My question is how can I keep the upstream version of the configure
file instread of the one in the working directory.
I read about the stage(1:2:3) but I do not know how if it is related to
my problem.
Thanks in advance.
Frédéric
next reply other threads:[~2007-05-15 9:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-15 9:38 picca [this message]
2007-05-15 10:25 ` newby question about merge Alex Riesen
2007-05-15 10:34 ` Jakub Narebski
2007-05-15 11:37 ` picca
2007-05-15 21:47 ` Junio C Hamano
2007-05-16 6:33 ` picca
2007-05-16 11:43 ` Johannes Schindelin
2007-05-16 14:21 ` Christian MICHON
2007-05-16 14:45 ` Johannes Schindelin
2007-05-16 19:35 ` Christian MICHON
2007-05-16 22:39 ` Johannes Schindelin
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=20070515113820.2621c8d5@localhost.localdomain \
--to=picca@synchrotron-soleil.fr \
--cc=git@vger.kernel.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).