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

Re: query regarding git merge

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Dec 13, 2015, 19:23 UTC
Message-ID
<20151213192316.GM990758@vauxhall.crustytoothpaste.net>
In-Reply-To
<CAGkBSDLMCZR=qrXJKTgpzGGQdogXHN+0Ub8qW=aPq80RjjN=5w@mail.gmail.com>
[Please don't top-post.]
On Mon, Dec 14, 2015 at 12:03:18AM +0530, Rohit Gupta wrote:
> Thanks brian. I understood my mistake in understanding the working of git
> merge.
> But isn't it wrong? As after merging, branch's logic can't work. How to get
> that right then ?

If you know that the merge didn't go the way you wanted, you can either add a follow-up commit, or you can do "git commit --amend" on the merge after making the necessary changes. In such a case, it may be useful to add a note to the commit message stating that you modified it from the original merge.

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
Previous: brian m. carlsonNext: Jeff King
Message 3 of 4 in “query regarding git merge”
  1. rohit guptaDec 13, 2015
  2. brian m. carlsonDec 13, 2015
  3. brian m. carlsonDec 13, 2015
  4. Jeff KingDec 14, 2015

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.