kevinjqliu commented on PR #1621: URL: https://github.com/apache/iceberg-python/pull/1621#issuecomment-2654631420
there a conflict with poetry.lock, heres something i found that worked ``` git fetch origin main git merge origin/main -X theirs poetry lock ``` This will ignore the conflict and regenerate the poetry lock file -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
