[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
signature.asc
Description: PGP signature
