You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by "ASF GitHub Bot (Jira)" <ji...@apache.org> on 2021/04/07 06:23:00 UTC
[jira] [Updated] (NETBEANS-4663) Mercurial and Subversion visual
conflict resolution
[ https://issues.apache.org/jira/browse/NETBEANS-4663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
ASF GitHub Bot updated NETBEANS-4663:
-------------------------------------
Labels: CND-DONATION-TODO pull-request-available (was: CND-DONATION-TODO)
> Mercurial and Subversion visual conflict resolution
> ---------------------------------------------------
>
> Key: NETBEANS-4663
> URL: https://issues.apache.org/jira/browse/NETBEANS-4663
> Project: NetBeans
> Issue Type: Sub-task
> Components: cnd - Remote VCS
> Reporter: Antonio Vieiro
> Assignee: Antonio Vieiro
> Priority: Major
> Labels: CND-DONATION-TODO, pull-request-available
> Time Spent: 10m
> Remaining Estimate: 0h
>
> The "ResolveConflictsExecutor" [1] for both mercurial and subversion, responsible for resolving conflicts visually, were not included in the CND donation from Oracle, and need to be implemented.
>
> [http://hg.netbeans.org/cnd-main/file/tip/mercurial.remote/src/org/netbeans/modules/mercurial/remote/ui/update/ResolveConflictsExecutor.java]
> [http://hg.netbeans.org/cnd-main/file/tip/subversion.remote/src/org/netbeans/modules/subversion/remote/ui/update/ResolveConflictsExecutor.java]
>
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists