ubuntu - git-flow 合并release分支的报错

Question

在使用git-flow时候，在合并release分支到develop和master的时候报错。
报错内容为：Working tree contains unstaged changes. Aborting.
但是过了一会儿，再次合并release时候就没有报错。
我想问一下，这是由于什么原因造成的。

另外，还有一个问题，在合并release时候会让我你们写备注的东西，该备注信息和tag
有什么区别吗？

谢谢！

Answer 1

Working tree contains unstaged changes

It means that there is currently uncommitted code in your workspace. It cannot be executed at this time rebase 的。。你得先 commit 或者 stash

---

Tag represents the version, such as 1.0.0. If you plan to bump the version to 1.0.1 after several merges, then this new tag will contain the merge information you wrote. My impression is