Hello, 

We are proud to announce Oxygen Git Client Add-on 6.0, a major update that makes Git workflows in Oxygen XML Editor, Oxygen XML Author, Oxygen XML Developer, and Oxygen JSON Editor faster, clearer, and easier to manage.

This release delivers a redesigned Git History view, AI-assisted merge conflict resolution, smarter credential management, partial stashing, visual image comparisons, and workflow refinements that help teams move from change to commit with greater confidence.

What's New in Oxygen Git Client Add-on 6.0:
*************************************

A Reimagined Git History View

The enhanced History view makes repository activity easier to understand at a glance. Uncommitted changes now appear in the graph as a pending commit, active merge, rebase, cherry-pick, and revert operations are clearly marked, and you can compare any two points in history, including a selected revision against the working copy. Interactive branch and status labels provide quick access to branch actions and tracking details. Together, these enhancements make it easier to trace changes, compare revisions, and understand work in progress without losing context.

AI-Assisted Conflict Resolution

AI Positron can now analyze conflicting file versions and propose a resolution with an explanation that you can verify using the available compare actions, then refine it further if needed. You stay in control as suggestions are applied only after approval. This helps you resolve conflicts more confidently while staying in control of the final result.

More Control, Less Friction

Version 6.0 adds context-sensitive controls for interrupted merge, rebase, cherry-pick, and revert operations, making it easier to continue, restart, or abort safely. A new Credentials preferences page lets you review and remove individual stored credentials, while an improved login behavior reduces repeated authentication steps. These improvements help you recover from interrupted workflows more easily and manage authentication with less friction.

Smarter Everyday Workflows

Partial stashing lets you stash selected files instead of the entire working copy, and a Rebase action enables you to rebase the current local branch onto a selected revision. Image diffs are displayed as true side-by-side visual comparisons, making design and asset changes easier to review.

Additional enhancements include Push and Pull actions on the current branch menu, faster remote branch discovery, improved Blame integration, new actions to ignore untracked files or folders, and customizable AI instructions for commit messages and commit explanations.

For a detailed list of the features added in Oxygen Git Client Add-on 6.0, please see:
https://blog.oxygenxml.com/topics/wn_git_client_6.html


Availability
*******************

Oxygen Git Client Add-on 6.0 is available for Oxygen XML Editor, Oxygen XML Author, Oxygen XML Developer, and Oxygen JSON Editor. You can update it from Help > Install new add-ons or install it from the Oxygen Git Client add-on page - https://www.oxygenxml.com/addons/com.oxygenxml.git.html

We hope that you will enjoy using the most recent release of the add-on as much as we enjoyed developing it. As always, your feedback is welcome!

Best regards,  
Alin 

-- 
Alin Belu
Oxygen XML Editor