yujun4464

Results 4 comments of yujun4464

@hlysf 你好可以看下 install.sh 脚本里获取master地址是不是正确的

> 麻烦老师指导下,这个冲突和您提出的问题,希望不能同时解决 改变目录后是有冲突的,可以本地 merge 下解决冲突 ![Uploading 截屏2025-05-14 14.38.09.png…]()

> ![图像](https://private-user-images.githubusercontent.com/123953953/443526736-99fdadad-32e8-4bc4-9c46-3e0530d46998.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3NDcyMDU1NjEsIm5iZiI6MTc0NzIwNTI2MSwicGF0aCI6Ii8xMjM5NTM5NTMvNDQzNTI2NzM2LTk5ZmRhZGFkLTMyZTgtNGJjNC05YzQ2LTNlMDUzMGQ0Njk5OC5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwNTE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDUxNFQwNjQ3NDFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0zYzQ4N2E0ODEyZTAyYTU5Y2QyNjkzZjIwNGE3ZjM1ZjYwNmFmM2M1YWM2NWZlZDk1YTQ1NjY3ZTdkYWM3NDk4JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.1-icqINX7xO8ifVCWN9KcujEEk8efs5BLD4pa1blBTA) git remote add upstream https://github.com/secretflow/kuscia.git

> > ![图像](https://private-user-images.githubusercontent.com/123953953/443526736-99fdadad-32e8-4bc4-9c46-3e0530d46998.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3NDcyMDU1NjEsIm5iZiI6MTc0NzIwNTI2MSwicGF0aCI6Ii8xMjM5NTM5NTMvNDQzNTI2NzM2LTk5ZmRhZGFkLTMyZTgtNGJjNC05YzQ2LTNlMDUzMGQ0Njk5OC5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwNTE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDUxNFQwNjQ3NDFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0zYzQ4N2E0ODEyZTAyYTU5Y2QyNjkzZjIwNGE3ZjM1ZjYwNmFmM2M1YWM2NWZlZDk1YTQ1NjY3ZTdkYWM3NDk4JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.1-icqINX7xO8ifVCWN9KcujEEk8efs5BLD4pa1blBTA) > > git 远程添加上游https://github.com/secretflow/kuscia.git 先同步下原创仓库的变更再merge试试 git fetch upstream