jerqi commented on PR #360:
URL:
https://github.com/apache/incubator-uniffle/pull/360#issuecomment-1328437863
You need to resolve the conflicts with master. you can use the command
```
git remote add upstream [email protected]:apache/incubator-uniffle.git
git fetch upstream
git merge upstream/master
```
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
