ubuntu - git-flow merges release branch error

Question

When using git-flow, an error is reported when merging the release branch into develop and master.
The error content is: Working tree contains unstaged changes. Aborting.
But after a while, no error was reported when the release was merged again.
I would like to ask what is the reason for this.

In addition, there is another question. When merging the release, I will ask you to write notes. Is there any difference between the note information and the tag
?

Thank you!

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