liurenjie1024 commented on PR #160:
URL: https://github.com/apache/iceberg-rust/pull/160#issuecomment-1886347244

   > Also , feature anyway has all the changes of main since it has been built 
on top of it , or should i rebase main with feature?
   
   Hi, @hiirrxnn You can learn how to resolve conflicts here: 
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line


-- 
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]

Reply via email to