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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
