git/list[1] front-page[2] threads[3] people[4] search[5] about
 

newby question about merge.

From
Ppicca <picca@synchrotron-soleil.fr>
Date
May 15, 2007, 09:38 UTC
Message-ID
<20070515113820.2621c8d5@localhost.localdomain>

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: Alex Riesen
Message 1 of 11 in “newby question about merge.”
  1. piccaMay 15, 2007
  2. Alex RiesenMay 15, 2007
  3. Jakub NarebskiMay 15, 2007
  4. piccaMay 15, 2007
  5. Junio C HamanoMay 15, 2007
  6. piccaMay 16, 2007
  7. Johannes SchindelinMay 16, 2007
  8. Christian MICHONMay 16, 2007
  9. Johannes SchindelinMay 16, 2007
  10. Christian MICHONMay 16, 2007
  11. Johannes SchindelinMay 16, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.