v1.9.5

aditosoftware · Oct 4, 2022 · 79c6082 · 79c6082
1 parent 2e8bc9f
commit 79c6082
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/IntegrationTests/pom.xml b/IntegrationTests/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>adito-nb-git</artifactId>
     <groupId>de.adito.git</groupId>
-    <version>1.9.4</version>
+    <version>1.9.5</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/api/pom.xml b/api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>adito-nb-git</artifactId>
     <groupId>de.adito.git</groupId>
-    <version>1.9.4</version>
+    <version>1.9.5</version>
   </parent>
 
   <artifactId>api</artifactId>

diff --git a/gui/pom.xml b/gui/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>adito-nb-git</artifactId>
     <groupId>de.adito.git</groupId>
-    <version>1.9.4</version>
+    <version>1.9.5</version>
   </parent>
 
   <artifactId>gui</artifactId>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>adito-nb-git</artifactId>
     <groupId>de.adito.git</groupId>
-    <version>1.9.4</version>
+    <version>1.9.5</version>
   </parent>
 
   <artifactId>impl</artifactId>

diff --git a/nbm/pom.xml b/nbm/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>adito-nb-git</artifactId>
     <groupId>de.adito.git</groupId>
-    <version>1.9.4</version>
+    <version>1.9.5</version>
   </parent>
 
   <packaging>nbm</packaging>

diff --git a/nbm/src/nbm/manifest.mf b/nbm/src/nbm/manifest.mf
@@ -6,6 +6,19 @@ OpenIDE-Module-Name: Git
 OpenIDE-Module-Display-Category: ADITO / VCS
 OpenIDE-Module-Long-Description: Git Support for NetBeans IDE.
   <p style="font-weight: bold;">Changelog</p>
+  <p style="font-weight: bold;">v1.9.5</p>
+  <p style="margin-left: 10px; font-weight: bold;">MINOR</p>
+  <ul>
+    <li>Added buttons for resolving both sides of a conflict in a merge at once</li>
+    <li>The table that shows the merge conflicts now keeps its selection when the contents of the table are changed and retains focus after a conflict is resolved</li>
+    <li>Added additional logging to the actions that are performed prior to a push</li>
+  </ul>
+  <p style="margin-left: 10px; font-weight: bold;">BUGFIX</p>
+  <ul>
+    <li>Fix: Accepting resolveable conflicts with imports leads to a disconnect between displayed content and actual content of the textPanes</li>
+    <li>Fix: Discarding changes from the right side of a merge can lead to wrong indices for the changed chunks</li>
+    <li>Fix: In some circumstances the calculation of the chunks can lead to an Exception that prevents displaying all other chunks</li>
+  </ul>
   <p style="font-weight: bold;">v1.9.4</p>
   <p style="margin-left: 10px; font-weight: bold;">MINOR</p>
   <ul>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>de.adito.git</groupId>
   <artifactId>adito-nb-git</artifactId>
   <packaging>pom</packaging>
-  <version>1.9.4</version>
+  <version>1.9.5</version>
 
   <properties>
     <netbeans.version>RELEASE111</netbeans.version>