v.1.4.7

aditosoftware · Nov 5, 2020 · 6a3b5d9 · 6a3b5d9
1 parent ca1ac60
commit 6a3b5d9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
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.4.6</version>
+    <version>1.4.7</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.4.6</version>
+    <version>1.4.7</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.4.6</version>
+    <version>1.4.7</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.4.6</version>
+    <version>1.4.7</version>
   </parent>
 
   <packaging>nbm</packaging>

diff --git a/nbm/src/nbm/manifest.mf b/nbm/src/nbm/manifest.mf
@@ -6,6 +6,23 @@ 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;">v.1.4.7</p>
+  <p style="margin-left: 10px; font-weight: bold;">MAJOR</p>
+  <ul>
+    <li>The auto-resolve in merges is a lot faster in general and also skips huge files, making it faster still. The auto-resolve for huge files may come back later on, if the performance is acceptable for them</li>
+  </ul>
+  <p style="margin-left: 10px; font-weight: bold;">MINOR</p>
+  <ul>
+    <li>Both the diff and the merge windows now have better information about where each version of the change is coming from (e.g. the name of the branch instead of YOURS/THEIRS)</li>
+    <li>Improvements to the calculation time of the positions of the changes in a diff or merge. This does not 100% fix the problem with bad scrolling behaviour, if you have the feeling that scrolling is not behaving the way it should try and resize the window. This should fix the issue</li>
+    <li>Double-clicking on a conflict in the merge window now triggers the manual resolve action</li>
+    <li>The diff window is now set to always start on the left side if the text is too big to fit into the ScrollPane</li>
+  </ul>
+  <p style="margin-left: 10px; font-weight: bold;">BUGFIXES</p>
+  <ul>
+    <li>Fix: Deadlock when trying to push a branch whose name does not match the name of the tracked remote branch</li>
+    <li>Fix: If two versions are the same in a diff, the notification about that fact is missing</li>
+  </ul>
   <p style="font-weight: bold;">v.1.4.6</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.4.6</version>
+  <version>1.4.7</version>
 
   <properties>
     <netbeans.version>RELEASE90a</netbeans.version>