matthiasblaesing opened a new pull request, #8622:
URL: https://github.com/apache/netbeans/pull/8622

   Usage: Select exactly two folder entries in the project/files/favorites, 
open the context menu and select "Tools" -> "Tree diff"
   
   
![grafik](https://github.com/user-attachments/assets/720389f6-e05b-4de9-892f-8315ef1446ea)
   
   This results in a flattened view of the difference between the two trees:
   
   
![grafik](https://github.com/user-attachments/assets/d37256bb-23a9-4770-bbba-c63dde25e686)
   
   - Entries with red background are present in the source, but not in the 
target
   - Entries with blue background are present in both locations but differ
   - Entries with green background are present in the target, but not in the 
source
   
   The list of modified files/folder can be display as hierarchy:
   
   
![grafik](https://github.com/user-attachments/assets/58f65b96-3cbb-43d2-9f24-f74b15a7f96e)
   
   When a modified file is selected the diff view shows both versions and 
allows to update the target:
   
   
![grafik](https://github.com/user-attachments/assets/b215abbe-63de-487b-bd97-2e80b7f474fb)
   
   Additionally actions can be invoked directly on the difference entries:
   
   
![grafik](https://github.com/user-attachments/assets/8c5ac2da-3982-49df-ad03-8d8e7f3c79d1)
   
   
![grafik](https://github.com/user-attachments/assets/7027017f-6b97-410d-a42c-dc15304639fb)
   
   
![grafik](https://github.com/user-attachments/assets/39c14811-8355-4b20-9207-c6d4209fe46d)
   
   Closes: #8349 


-- 
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-unsubscr...@netbeans.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@netbeans.apache.org
For additional commands, e-mail: notifications-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to