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

Re: Rebase and incrementing version numbers

From
Carlos Martín Nieto <cmn@elego.de>
Date
Jan 25, 2012, 10:53 UTC
Message-ID
<1327488820.3052.15.camel@beez.lab.cmartin.tk>
In-Reply-To
<CAP8UFD0gd_-=Cc0vox-6Ts4-iBWcJG8LgmqXteXgp3qc-bX13w@mail.gmail.com>
On Wed, 2012-01-25 at 11:32 +0100, Christian Couder wrote:
Show 6 quoted lines
> On Thu, Jan 19, 2012 at 8:20 PM, Carlos Martín Nieto <cmn@elego.de> wrote:
> > You could write a merge driver that detects this situation and writes in
> > a higher number, but it's all working around the fact that it's a race
> > condition.
> 
> By "merge" driver you mean a new merge startegy?
No. By "merge driver" I mean a "merge driver".
> 
> Isn't it possible to write a script and use it with git mergetool to
> automatically detect and resolve the merge conflicts resulting from
> changes in these numbers?

No. A mergetool is what you call manually to help you resolve a merge conflict. What you're describing is a merge driver. If you grep for "driver" in the merge manpage, you'll see how to set it, and it'll tell you to look in the gitattributes manpage for more information. If you search the web for "git merge driver" you'll see lots of examples of how these are done.

   cmn
Previous: Christian CouderNext: Christian Couder
Message 12 of 16 in “Rebase and incrementing version numbers”
  1. Michael NahasJan 19, 2012
  2. demerphqJan 19, 2012
  3. Michael NahasJan 19, 2012
  4. PJ WeisbergJan 19, 2012
  5. Michael NahasJan 19, 2012
  6. Santi BéjarJan 19, 2012
  7. John SzakmeisterJan 25, 2012
  8. Carlos Martín NietoJan 19, 2012
  9. Michael NahasJan 19, 2012
  10. Carlos Martín NietoJan 20, 2012
  11. Christian CouderJan 25, 2012
  12. Carlos Martín NietoJan 25, 2012
  13. Christian CouderJan 25, 2012
  14. Jehan BingJan 19, 2012
  15. Jon SeymourJan 19, 2012
  16. Jeff KingJan 25, 2012

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.