wechaty / dotnet-wechaty

.NET Wechaty is a Conversational SDK for Chatbot Makers Written in C#
Apache License 2.0
80 stars 29 forks source link

Feature/darren/environmentvariable update #15

Closed Jesn closed 3 years ago

Jesn commented 3 years ago

environment variable update as WECHATY_PUPPET_HOSTIE_TOKENWECHATY_PUPPET , unity with the community

Jesn commented 3 years ago

当前分支,在本地meraged master分支,导致冲突,无法合并,特废弃当前pr,重新

This branch cannot be rebased due to conflicts
Rebasing the commits of this branch on top of the base branch cannot be performed automatically due to conflicts encountered
while reapplying the individual commits from the head branch.

根据 Echofool 给出的以下建议,重新提交了pr #16

git checkout 你当前这个特性分支

//以下几个命令的意思就是把最近自己干的事情,暂存到暂存区,暂存区仅暂存改动哦
git reset {hash} 这个 {hash} 就是你这一次所有改动之前的 一个 hash。
git add .
git stash save {这里可以命名 也可以不命名}

//这里就是使得本地的 master 和 远端保持一致
git checkout master
git pull

//重新搞一个分支
git checkout -b 重新命名一个分支

//把最近自己干的事情从暂存区 弹出来
git stash pop
git add .
git commit -m "你的说明"

//把新分支推送到远端
git push -u origin 你的分支名字