Hi, This introduces an extra commit, it would be better to resolve the conflict locally before push to remote repository.
I suggest to use git pull --rebase to keep the commits clean. No sure how other people think. On Tue, Dec 11, 2018 at 1:51 PM <m...@apache.org> wrote: > > This is an automated email from the ASF dual-hosted git repository. > > min pushed a commit to branch asf-site > in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git > > commit deb5e90a50ff070bf16d0218cafe8ac64196d813 > Merge: dd0224a a71d0fc > Author: nzomkxia <z82507...@gmail.com> > AuthorDate: Tue Dec 11 13:51:55 2018 +0800 > > Merge branch 'asf-site' of github.com:nzomkxia/incubator-dubbo-website > into asf-site > > # Conflicts: > # docs/en-us/admin/install/admin-console.md > # docs/zh-cn/admin/install/admin-console.md > > docs/en-us/admin/install/admin-console.md | 2 +- > docs/zh-cn/admin/install/admin-console.md | 4 ++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --cc docs/en-us/admin/install/admin-console.md > index 63bb334,1963df8..1941235 > --- a/docs/en-us/admin/install/admin-console.md > +++ b/docs/en-us/admin/install/admin-console.md > @@@ -37,4 -41,4 +37,4 @@@ Visit [^2] > http://127.0.0.1:8080 > ``` > > --[^1]: There's no login for current version, will be added later > ++[^1]: There's no login for current version, will be added later > diff --cc docs/zh-cn/admin/install/admin-console.md > index f92fc9c,482c6da..85a4426 > --- a/docs/zh-cn/admin/install/admin-console.md > +++ b/docs/zh-cn/admin/install/admin-console.md > @@@ -1,4 -1,4 +1,8 @@@ > ++<<<<<<< HEAD > +### 管理控制台安装 > ++======= > + ###管理控制台安装 > ++>>>>>>> a71d0fc87489096a2e99133c47769ffa750bafa6 > > 目前版本的管理控制台正在开发中，已经完成了服务查询和服务治理的功能，采用前后端分离的模式，具体的安装和使用步骤如下： > > -- Best Regards！ Huxing
