Merge Develop & Master Branches
RAndrews137 opened this issue · comments
The Develop and Master branches have gotten out-of-sync and need to be merged. There was a check-in to Master in March 2016 which bypassed Develop. There are several changes in Develop which haven't been merged into Master after several months. The purpose of raising this issue is to merge Develop branch into Master, and for Develop to pick up any needed changes from Master. That way, Develop can be used again for upcoming code. Going forward, recommend only approving PR's from the Develop branch. Never straight into Master.
Hi, I created a new 2.2.x branch that depends upon OrientDB 2.2.x versions. I merged master and develop and the created 2.2.x from develop. I will follow the same branch semantics we have on orientdb repository.
Thanks Roberto. Should users always use the versioned branches to coincide with the db version? I think normal habit is to use Master. We will use the 2.2.x as you recommended. Just thinking about new people who may not immediately understand that they should use 2.2.x and not Master for latest db version. Thank you once again for your help with the Spring Data framework :)