[GitHub] [commons-imaging] kinow commented on pull request #173: ISSUE-311 support multivariable rasters
kinow commented on pull request #173: URL: https://github.com/apache/commons-imaging/pull/173#issuecomment-946306018 @gwlucastrig I started fixing the conflicts, but then one of the commits was really confusing. I couldn't understand what had happened. You could try rebasing and fixing conflicts, or maybe start from scratch, sorry. It looks like it has some merging commits. Did you rebase with `git fetch ...` then `git rebase ...`? Or did you `git pull`? `git pull` will fetch, and create a merge commit, which I find causes issues like this sometimes. -- 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: issues-unsubscr...@commons.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [commons-imaging] kinow commented on pull request #173: ISSUE-311 support multivariable rasters
kinow commented on pull request #173: URL: https://github.com/apache/commons-imaging/pull/173#issuecomment-946287465 Oh, spoke too fast I think? It actually says: >This branch cannot be rebased due to conflicts >Rebasing the commits of this branch on top of the base branch cannot be performed automatically due to conflicts encountered while reapplying the individual commits from the head branch. Let me have a go at trying to rebase it, I should be able to push to this branch too. -- 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: issues-unsubscr...@commons.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [commons-imaging] kinow commented on pull request #173: ISSUE-311 support multivariable rasters
kinow commented on pull request #173: URL: https://github.com/apache/commons-imaging/pull/173#issuecomment-946272094 > It was going well, but it may have fallen apart at the end. When I did a git rebase with a squash, git pulled in some merge commits with recent dependabot changes. Some of the commit comments for things I didn't work on (like pom.xml) may have been modified. > > If necessary, I can scuttle this PR and resubmit it. @gwlucastrig I think what you saw were commits added before your change, as you rebased. So your changes should be at the top of the other commits :-) Everything looks good from looking at GitHub UI. Reviewing again today :tada: -- 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: issues-unsubscr...@commons.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [commons-imaging] kinow commented on pull request #173: ISSUE-311 support multivariable rasters
kinow commented on pull request #173: URL: https://github.com/apache/commons-imaging/pull/173#issuecomment-942829570 >I've fixed most of the whitespace-related issues. So I hope the code will be easier to review. >Unfortunately, some of the Javadoc received different line-breaks, and I don't think I will be able to restore them without an undue amount of effort. Thanks and not a problem @gwlucastrig ! >Otherwise, the code is now ready for review. :+1: hopefully will be complete by end of week. Thanks for the PR ! -- 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: issues-unsubscr...@commons.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
