MatrixHB commented on PR #4113: URL: https://github.com/apache/rocketmq/pull/4113#issuecomment-1088511618
> @MatrixHB I create new branch from **master** instead of develop branch, is this right operation? > > I plan resolving the conflicts when the ’conflict change‘ merged into master. You should create new branch from `develop` branch next time. For this pr, I suggest you can merge `develop` and resolve conflicts in your local branch, and then push it again. -- 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]
