You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by "datbates (via GitHub)" <gi...@apache.org> on 2024/01/10 22:21:23 UTC
[I] Merge Conflicts Resolver does not allow editing in "Result after merge" [netbeans]
datbates opened a new issue, #6944:
URL: https://github.com/apache/netbeans/issues/6944
### Apache NetBeans version
Apache NetBeans 20
### What happened
This used to work. it was fixed in this archived bug: https://bz.apache.org/netbeans/show_bug.cgi?id=141198
but seems to have reappeared
### Language / Project Type / NetBeans Component
_No response_
### How to reproduce
1. Merge a branch generating a git conflict.
2. Select a change to accept or both
3. Try to change the result in the lower pane.
4. An edit cursor appears but editing is not allowed
### Did this work correctly in an earlier version?
Apache NetBeans 13 or earlier
### Operating System
Mac OS 14.1.2 (23B2091)
### JDK
OpenJDK Runtime Environment AdoptOpenJDK (build 15.0.2+7)
### Apache NetBeans packaging
Apache NetBeans provided installer
### Anything else
_No response_
### Are you willing to submit a pull request?
Yes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [I] Merge Conflicts Resolver does not allow editing in "Result after merge" [netbeans]
Posted by "datbates (via GitHub)" <gi...@apache.org>.
datbates commented on issue #6944:
URL: https://github.com/apache/netbeans/issues/6944#issuecomment-1885836410
I am not a pro with GitHub, but would love to learn how fix and contribute to the project.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [I] Merge Conflicts Resolver does not allow editing in "Result after merge" [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien commented on issue #6944:
URL: https://github.com/apache/netbeans/issues/6944#issuecomment-1886553012
i checked and it looks like we could simply make the editor of the results window editable. The way it works is that the user is supposed to commit after the conflict resolve step anyway, so I don't see why it would have to be read only.
going to link the PR here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [I] Merge Conflicts Resolver does not allow editing in "Result after merge" [netbeans]
Posted by "datbates (via GitHub)" <gi...@apache.org>.
datbates commented on issue #6944:
URL: https://github.com/apache/netbeans/issues/6944#issuecomment-1889713665
sorry it's not easy. I was hoping.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [I] Merge Conflicts Resolver does not allow editing in "Result after merge" [netbeans]
Posted by "mbien (via GitHub)" <gi...@apache.org>.
mbien commented on issue #6944:
URL: https://github.com/apache/netbeans/issues/6944#issuecomment-1886708128
nevermind, this isn't going to be that easy. The diff view of the result panel only expects content from the two source panels so that functionality would have to go (line numbers would break too). Save action would have to be disabled otherwise the document could be saved before `ok` is pressed etc.
https://github.com/mbien/netbeans/tree/editable-git-merge-conflicts-panel
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists