xiarixiaoyao commented on pull request #4786:
URL: https://github.com/apache/hudi/pull/4786#issuecomment-1059778251
@MrSleeping123
yes of course you can create a new pr， but before you do that， your can try
to use rebase to solve this problems
prepare work:
add apache hudi as your up stream branch
eg: for this pr
`git remote add github_hudi [email protected]:apache/hudi.git `
2) prepare to rebase
step1: `git pull github_hudi master --rebase` (git will tell you that
some conflict files merged failed, should be fixed by yoursefl)
eg: for those pr,
AvroConversionUtils.scala/DataSourceUtils.java/HoodieSparkSqlWriter.scala/HiveSyncConfig.java
will merge failed
step2: solve the conflict problem
eg:
open your IDEA and find the conflict files which git tell you(
AvroConversionUtils.scala/DataSourceUtils.java/HoodieSparkSqlWriter.scala/HiveSyncConfig.java)
check those conflict files carefully, and fixed those
step3: git add fixed-files(do not use "git add ." command)
eg: for this pr
`git add xxx/AvroConversionUtils.scala`
`git add xxx/DataSourceUtils.java`
`git add xxx/HoodieSparkSqlWriter.scala`
`git add xxx/HiveSyncConfig.java`
step4: continue rebase
`git rebase --continue`
step5: git push origin your_pr_branch
eg: for this pr
`git push (-f) origin 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]
