Closed ghost closed 2 years ago
@jsavell that is exactly why I used cherry-picking instead of just copying the file. When upgrade merging upstream 6.4 shouldn't it recognize those? I thought cherry-picking was the solution to avoid conflicts. I do see they have different commit hashes.
I created an updated branch from all of 6.4-SNAPSHOT and it did not ant build.
I'm a little nervous about the cherry-picking.
When it comes time to merge https://github.com/DSpace/DSpace/commits/dspace-6_x into our custom 6x, we're going to end up with some double commits and that can throw off the git merge strategies.
I'm also not sure how else to get these commits into our custom 6x since the source branch has been deleted, short of merging all of dspace-6_x since the 6.3 release.