dmMaze / BallonsTranslator

深度学习辅助漫画翻译工具, 支持一键机翻和简单的图像/文本编辑 | Yet another computer-aided comic/manga translation tool powered by deeplearning
GNU General Public License v3.0
2.68k stars 179 forks source link

请给一个如何更新的教程 #539

Open madpeach2323 opened 2 months ago

madpeach2323 commented 2 months ago

运行local_gitpull.bat的时候 fatal: unable to access 'https://github.com/dmMaze/BallonsTranslator/': Failed to connect to github.com port 443 after 21127 ms: Couldn't connect to server 请问如何解决这个问题,有时还是 hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches. 非计算机专业,在尝试询问ai后无果,希望可以得到解答

dmMaze commented 2 months ago

第一个问题是国内对 github 有阻断,连不连的上看脸,可以挂全局代理 第二个问题是要么你改了本地代码要么你非常不巧地遇到了我强制 push... 我以后尽量避免,你可以在软件目录下打开命令行,输入:

git pull --ff-only

或者

git reset --hard HEAD~3
git pull

或者下网盘里的 gitwithpython 那个包,解压覆盖到软件目录

madpeach2323 commented 2 months ago

BallonsTranslator_dev_src_with_gitpython.7z是这个压缩包吗?可是我解压安装的就是这个呀😰

dmMaze @.***> 于 2024年8月13日周二 下午12:07写道:

第一个问题是国内对 github 有阻断,连不连的上看脸,可以挂全局代理 第二个问题是非常你非常不巧地遇到了我强制 push... 我以后尽量避免,你可以在软件目录下打开命令行,输入:

git pull --ff-only

或者

git reset --hard HEAD~3 git pull

或者下网盘里的 gitwithpython 那个包,解压覆盖到软件目录

— Reply to this email directly, view it on GitHub https://github.com/dmMaze/BallonsTranslator/issues/539#issuecomment-2285301037, or unsubscribe https://github.com/notifications/unsubscribe-auth/BAJKUGXZ43REVW3NZISK623ZRGA73AVCNFSM6AAAAABMMXLJ5SVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEOBVGMYDCMBTG4 . You are receiving this because you are subscribed to this thread.Message ID: @.***>

dmMaze commented 2 months ago

BallonsTranslator_dev_src_with_gitpython.7z是这个压缩包吗?可是我解压安装的就是这个呀😰

我是说遇到了第二个问题上面方法三选一。网盘里一般都会保持最新。