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.
ID | Product | Comp▲ | Assignee▲ | Status▼ | Resolution | Summary | Changed |
---|---|---|---|---|---|---|---|
65051 | versionc | CVS | issues | RESO | DUPL | [50cat] Impossible to merge modification with Resolve Conflict | 2008-04-15 |
65783 | utilitie | Diff | mentlicher | RESO | DUPL | [50cat] Impossible to correctly merge a class. And no version nr appears in resolve conflict window. | 2005-10-04 |
76682 | utilitie | Diff | diff-issues | RESO | DUPL | Better merge support in diff windows | 2008-04-23 |
128168 | utilitie | Diff | diff-issues | RESO | DUPL | Merge Conflicts Resolver: Make it possible to pick both changes | 2008-04-08 |
66019 | utilitie | Diff | mentlicher | RESO | DUPL | [50cat] Support for applying both changes | 2008-04-08 |