This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Summary: | [73cat] Suggest standard merge commit message when committing merge after resolving conflicts | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | misterm <misterm> |
Component: | Git | Assignee: | Ondrej Vrabec <ovrabec> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | git, janario |
Priority: | P3 | Keywords: | PLAN |
Version: | 7.3 | ||
Hardware: | PC | ||
OS: | Windows 7 | ||
Issue Type: | ENHANCEMENT | Exception Reporter: | |
Attachments: | IDE log |
Description
misterm
2013-01-23 11:30:44 UTC
Integrated into 'main-golden', will be available in build *201301290001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/a2998c051e12 User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #225230 - [73cat] Suggest standard merge commit message when committing merge after resolving conflicts Well, I just had to resolve a merge because it would result in a conflict and the message wasn't suggested as expected: Product Version: NetBeans IDE Dev (Build 20130130-8551ab433946) Java: 1.7.0_07; Java HotSpot(TM) 64-Bit Server VM 23.3-b01 Runtime: Java(TM) SE Runtime Environment 1.7.0_07-b11 System: Windows 7 version 6.1 running on amd64; Cp1252; en_US (nb) Created attachment 130841 [details]
IDE log
What is the label next to your project name. It should state something as "[Merged - master]". And please let me know what is the content of .git/MERGE_MSG And please take a look if "Automatically fill into commit message" is selected or not (in the commit dialog click on the Recent Messages button in the top right corner) Let make it clear. Merge message is displayed only sometimes. The order is following: 1) commit message template - if autofill selected in "Load Template" in the right top corner 2) last committed message - if autofill selected in "Recent Messages" in the top right corner 3) last canceled commit message - if you open the dialog and cancel it, then the commit message is stored so you can continue typing and finish it once the dialog is opened again 4) merge commit message So make sure you really get over 1-3 to 4. I understand it, but I don't agree with #2 and #3 coming first and I have no experience with #1. A merge should always use the standard message, because that's what it will use in case of no conflict. If one wants to change it, it's a very unlikely exception to the rule. (In reply to comment #8) > A merge should always use the standard message, because > that's what it will use in case of no conflict. If one wants to change it, it's > a very unlikely exception to the rule. OK, you're probably more experienced Git user than i am. I will give merge messages the highest priority. > fixed: http://hg.netbeans.org/core-main/rev/f91d0ca4a86f
sorry, wrong issue
Integrated into 'main-golden', will be available in build *201302020001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/830b27c6b18c User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #225230 - [73cat] Suggest standard merge commit message when committing merge after resolving conflicts merge commit messages now have the highest priority |