tzaeschke opened a new pull request, #53:
URL: https://github.com/apache/db-jdo/pull/53

   The 3.2 branch wasn't merged into main after the 3.2 release.
   The branch did not contain any features (which were all in the main branch 
already) but only changes to some xml and other document files.
   
   This PR contains missing changes that should still be merged into main, even 
though we already had a 3.2 release.
   This PR is equivalent to rebasing 3.2 HEAD onto main HEAD.
   
   The parent commit of 3.2 is 9205b733 from 07/10/2021 at 21:13
   Comparing 3.2 HEAD against 9205b733caeac377e0078a05206839268fdcf0f0 shows 
the following files have changed:
   
![NhjoBq0h0I3t8Twe](https://user-images.githubusercontent.com/1595847/173233227-db85023c-e471-4f75-9616-936310029736.png)
   
   However, during rebase, the following conflicts were shown:
   
   
![JgUX7602B0ijNjzt](https://user-images.githubusercontent.com/1595847/173233283-ea240bc9-4765-4e8e-a037-77666d1d9c3f.png)
   
   Notably, all of the spec files appear to have been modified. I assume this 
can be ignored but that needs to be confirmed.
   


-- 
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: jdo-dev-unsubscr...@db.apache.org

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

Reply via email to