就點了一下 Git工作流-完成功能 就報錯了
錯誤如下
git flow feature finish -k oms
bash: /dev/tty: No such device or address
error: failed to execute prompt script (exit code 1)
fatal: could not read Username for 'https://gitee.com': No such file or directory
Fatal: Could not fetch feature/oms from origin.
完成時帶有錯誤，見上文。
解決，在命令行模式中，執行一下命令，然后在彈出框中輸入用戶名和密碼，后面還有寫備注，然后就保存就可以了
編輯命令：i
退出編輯界面：Esc按鍵
保存的命令：:wq
命令：git flow feature finish -k oms
遇到的報錯如下
git flow feature finish -k oms
bash: /dev/tty: No such device or address
error: failed to execute prompt script (exit code 1)
fatal: could not read Username for 'https://gitee.com': No such file or directory
Fatal: Could not fetch feature/oms from origin.
完成時帶有錯誤，見上文。
E325: 注意
發現交換文件 "/d/java/projects/ecyun2/.git/.MERGE_MSG.swp"
所有者: Administrator 日期: 周五 十一月 06 14:18:57 2020
文件名: /d/java/projects/ecyun2/.git/MERGE_MSG
修改過: 是
用戶名: Administrator 主機名: YangZhiNongPC
進程 ID: 1371
正在打開文件 "/d/java/projects/ecyun2/.git/MERGE_MSG"
日期: 周五 十一月 06 14:36:22 2020
比交換文件新！
(1) Another program may be editing the same file. If this is the case,
be careful not to end up with two different instances of the same
file when making changes. Quit, or continue with caution.
(2) An edit session for this file crashed.
如果是這樣，請用 ":recover" 或 "vim -r /d/java/projects/ecyun2/.git/MERGE_MS
G"
恢復修改的內容 (請見 ":help recovery")。
如果你已經進行了恢復，請刪除交換文件 "/d/java/projects/ecyun2/.git/.MERGE_MS
G.swp"
以避免再看到此消息。
Administrator@YangZhiNongPC MINGW32 /d/java/projects/ecyun2 (feature/oms)
$ git flow feature finish -k oms
Switched to branch 'develop'
Your branch is up to date with 'origin/develop'.
hint: Waiting for your editor to close the file... error: There was a problem with the editor 'vi'.
Not committing merge; use 'git commit' to complete the merge.
There were merge conflicts. To resolve the merge conflict manually, use:
git mergetool
git commit
You can then complete the finish by running it again:
git flow feature finish oms
Merge branch 'feature/oms' into develop
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
:wq