| Issue 3150: | commit-msg hook should move Change-Id line after "conflicts" lines | |
| 1 person starred this issue and may be notified of changes. | Back to list |
When a merge conflict is resolved, the commit message can end up with a "conflicts" section added after the existing Change-Id line. The commit-msg hook should detect this and move the Change-Id line to after the conflicts section.
Jan 29, 2015
Project Member
#1
bklarson@gmail.com
Feb 5, 2015
I see in the latest version of git [1] the conflicts section is commented out. [1] http://git-blame.blogspot.jp/2015/02/git-23.html
Feb 8, 2015
Recommend updating git client instead.
Status:
WontFix
|
|
| ► Sign in to add a comment |