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: | Merge commit ignores changes after resolving | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | hifi |
Component: | Git | Assignee: | Ondrej Vrabec <ovrabec> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | git |
Priority: | P3 | ||
Version: | 8.1 | ||
Hardware: | All | ||
OS: | All | ||
Issue Type: | DEFECT | Exception Reporter: |
Description
hifi
2014-12-18 11:46:41 UTC
(In reply to hifi from comment #0) > There is really only one sane solution to this in my opinion and that would > be doing the equivalent of "git commit -a" always in a merge commit while > also allowing new files to be added optionally in the commit window because > that is completely valid in some cases if resolving the merge required > extensive modifications. True, i noticed this unexpected behavior some time ago, too. I agree commit window should add all (previously committed) files before the merge commit. I will see what i can do. > Additionally the "Add" option should be completely removed as the staging > area is nowhere visible and is very confusing without any indication of it. > You can always select what you are going to commit in the commit window > AFAIK so the functionality is completely redundant. You're wrong. Staged changes (aka index) can be reviewed both in the commit dialog and the status window (Git -> Show Changes) [1], you just have to switch to HEAD/Index mode. > Removing any possibility to use the staging area is much better than having > only partial support. I don't see it being very useful in NetBeans anyway > because you can do staging and committing in the commit window directly and > adding support for partial commits there would again make staging area > redundant. True, for normal users index is almost hidden in NetBeans, but whoever wants to benefit from it, may do so and use index as if in CLI. [1] - https://netbeans.org/kb/docs/ide/git.html#viewFileStatus - the part of the article describing status view icons (In reply to Ondrej Vrabec from comment #1) > (In reply to hifi from comment #0) > > Additionally the "Add" option should be completely removed as the staging > > area is nowhere visible and is very confusing without any indication of it. > > You can always select what you are going to commit in the commit window > > AFAIK so the functionality is completely redundant. > You're wrong. Staged changes (aka index) can be reviewed both in the commit > dialog and the status window (Git -> Show Changes) [1], you just have to > switch to HEAD/Index mode. "..., you just have to switch ...", I would still call this quite hidden since it isn't on your face all the time. :) > > Removing any possibility to use the staging area is much better than having > > only partial support. I don't see it being very useful in NetBeans anyway > > because you can do staging and committing in the commit window directly and > > adding support for partial commits there would again make staging area > > redundant. > True, for normal users index is almost hidden in NetBeans, but whoever wants > to benefit from it, may do so and use index as if in CLI. When you can't add partial hunks/lines into the index I find it rather useless when you can do mostly the same thing in the commit window anyway. My use might be limited since I almost never use the index in CLI except when I make partial commits and stage single lines/hunks. All in all, fixing this inconsistent behavior is more than enough. Fix: core-main #9a93fb7e9d08 Changeset: 9a93fb7e9d08 Message: Showing HEAD vs Working Tree mode by default when committing after a merge. The commit table now marks all modifications to be committed except for new files. Integrated into 'main-silver', will be available in build *201503040001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-silver/rev/9a93fb7e9d08 User: Ondrej Vrabec <ovrabec@netbeans.org> Log: Showing HEAD vs Working Tree mode by default when committing after a merge. The commit table now marks all modifications to be committed except for new files. Task #249427 - Merge commit ignores changes after resolving |