matthiasblaesing opened a new pull request, #6823: URL: https://github.com/apache/netbeans/pull/6823
NetBeans can create amend commits, i.e. change existing commits by adding later changes to it. This creates a conflict if the original change was already pushed to a remote repository. git CLI allows you to invoke a "forced push", which ignores history conflicts and executes the push regardless. That functionality is added to the IDE here. There are two places that are affected: 1. The UI that reports a history conflict. Before this change the user was informed, that there were conflicting changes in the target branch but did not get another option than aborting. The first change here was to allow the user to invoke a forced push:<br /> <br/> If "Force push" is selected the push is executed again, now forced. 2. The "Fetch"-Action already allowed users to enabled destructive actions on fetch (Labeled "Enable Deletes"). The functionality was generalized to "Enable destructive actions" and also added to the "Push" dialog. <br /> **Existing functionality renamed from "Enable Deletes" to "Enable destructive actions".** <br /> **New functionality added to the "Push" dialog**   For the API change: JGIT and the NetBeans integration was already prepared for forced pushes and already supported them for tags. For other pushes the `PushCommand` overrode the users decision and downgraded a forced push to a normal push. This was already questioned in a comment there and makes the API unintuitive to use. The block was thus removed. The API itself is unaffected, existing code will continue to work, only if users relied on this undocumented and unintuitive behavior they will be affected. It makes no sense to build a "force push" push specification, just to get it modified by the the command that shall execute it. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
