gwlucastrig commented on pull request #173: URL: https://github.com/apache/commons-imaging/pull/173#issuecomment-946594231
It will be easy enough to cancel the PR and submit a new one with my changes. I will not make any additional code changes so the review should be straightforward. On Mon, Oct 18, 2021, 10:07 PM Bruno P. Kinoshita ***@***.***> wrote: > @gwlucastrig <https://github.com/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. > > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub > <https://github.com/apache/commons-imaging/pull/173#issuecomment-946306018>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/AEWJDYK36YIVLQB7CAJUVW3UHTHG7ANCNFSM5FTRL75Q> > . > Triage notifications on the go with GitHub Mobile for iOS > <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> > or Android > <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>. > > -- 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]
