版本控制 - git 版本发布的流程，合并到develop分支之后怎么操作

Question

git 发版本的流程，从 Local 本地的 develop 分支上创建  PD_BUG001分支，修复完成，push到远程，远程网页上创建 pull request 合并请求到 develop。管理员同意了合并请求，这个时候是发布哪个版本的分支到 远程服务器上的代码？
按照个人的思路，应该是发布master分支把，如果这样还得把 develop 分支再合并到master 分支吗？
再去那个服务器上 git pull 拉取master 分支，这样的吗？

Answer 1

Normally there is a Server branch dedicated to the server.

---

Simply put it is this.

1. Your Fork project

2. You complete the function in the local branch (may require multiple commits)

3. Pull original project, and merge

4. Push to your fork project

5. Pull Request to a branch of the original project

---

2A. Determine a commit as the code that will be officially put online, and tag it.
2B. Test the code in the test environment
2C. Push the commit to the Server branch.

2D.git pull

Answer 2

GIT is distributed, there is no strong inheritance relationship, and there is no strong connection between local branches and remote branches.
Your code request is merged into the remote develop branch. After the administrator agrees, the code will of course be on the remote develop branch.

In addition, there is a big problem with your process. The branch to fix the bug should be created from the master branch, and then synchronized to the master and develop branches at the same time, instead of branching off develop and then to the master branch. If you do this in the middle of develop and the bug is urgent, should you abandon the developed code or wait until develop is fully developed before fixing the bug?