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

Post-merge hook

From
IMIlesh Mistry <ilesh.m@mmtdigital.co.uk>
Date
Jan 19, 2017, 23:54 UTC
Message-ID
<A6C196AD-41F5-4FA3-A2A9-6CBDA473AB6B@mmtdigital.co.uk>
Hello
I have been looking around for this, but I can't seem to find any examples of how to use the git post-merge hook. Can you help me please?
I want to do something really simple in the sense of pulling locally and once pulled and merged any conflicts (if any) then run a command line code. But run this code after any merge conflicts are resolved.
Can you help me by pointing me into the right direction on how I can resolve this please?

Thanks Ilesh

Sent from my iPhone

Ilesh Mistry Kentico Technical Architect T 01572 822 278

www.mmtdigital.co.uk <http://www.mmtdigital.co.uk>

RAR Digital Awards Winner 2016: Best Web Development Agency in the UK RAR Digital Awards Winner 2016: Best Software Development Agency in the UK RAR Digital Awards Winner 2016: Best Analytics Agency in the UK RAR Digital Awards Winner 2015: Best Web Design Agency in the UK Econsultancy 2016 Top 100 Agency The Drum Digital Census 2015: Elite Agency Top 10

Participation in this email correspondence denotes acceptance of terms and conditions available on request or from our website, unless a separate contract has been agreed.

Registered Office: 1A Uppingham Gate, Ayston Road, Uppingham, Rutland, LE15 9NY Company Number: 3681297 VAT Registration: 638 5654 05

Message 1 of 1 in “Post-merge hook”
  1. Ilesh MistryJan 19, 2017

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.