docker镜像需要更新

[Memorywzd]

docker镜像需要重新构建，项目代码与镜像内的冲突，在启动容器时无法pull完成更新

[Maskbugzero]

补充一下报错日志

 ======== 
 [信息]  正使用 git pull 同步项目  
 ======== 
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.

[user-txt]

目前遇到同样的问题,貌似是代码切换导致冲突.

[jiajiu123]

出现同样问题，尝试attach输入git config pull.rebase false，但容器进程结束太快无法输入

[lkeme]

已更新镜像v2.0.6