stevenzwu merged PR #11011:
URL: https://github.com/apache/iceberg/pull/11011
--
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
stevenzwu commented on PR #11011:
URL: https://github.com/apache/iceberg/pull/11011#issuecomment-2311125687
`apply` cmd used three-way merge for conflict.
just to be safe, can you also run the diff and make sure diffs are not
related to your change?
```
git diff --no-index
fli
rodmeneses commented on PR #11011:
URL: https://github.com/apache/iceberg/pull/11011#issuecomment-2311085432
> > Steps:
> > ```shell
> > git diff HEAD^ HEAD > /tmp/v1.19.patch
> > cat /tmp/v1.19.patch | sed "s/v1.19/v1.20/g" > /tmp/v1.20.patch
> > git apply -3 /tmp/v1.20.patch
stevenzwu commented on PR #11011:
URL: https://github.com/apache/iceberg/pull/11011#issuecomment-2311083518
> Steps:
>
> ```shell
> git diff HEAD^ HEAD > /tmp/v1.19.patch
> cat /tmp/v1.19.patch | sed "s/v1.19/v1.20/g" > /tmp/v1.20.patch
> git apply -3 /tmp/v1.20.patch
> ```
