在分支的合并请求合并后添加到分支是否不好？

Question

I'm working on a project where we branch off of develop for each feature and once the work is done a pull request is made as usual.

I'm wondering if later on I find I want to make some changes to how I implemented the feature is it better to just make a new branch or, since it's still dealing with that feature, to checkout that branch, merge with develop, make changes and then resubmit a pull request? What is best practice in this situation?

Answer 1

I would just make a new branch. The more recent your branch point, the fewer conflicts you'll have to deal with when merging.

Answer 2

Technically, as long as you merge master on top of the feature branch before changing anything, it is not a problem re-using a branch. However, your project seems to follow the "one branch-per-issue model" and that's why it may be "bad", and also why the question may out of scope for this page.

Case 1: Faulty implementation

Although it should not happen since you have done tests on the code, test in real-world applications, and another person checked all that during after your pull-request, there might be still something wrong. I am personally fine with re-open a ticket and its according branch.

Case 2: The feature might be enhanced

However, if the feature was doing his job and you soleley want to optimise it, that is a new feature. Depending on the tools you're using in the whole development process, you simply want to seperate this new feature (and its discussions etc) from the old one to measure the work/outcome etc properly.

If that is "bad" or not is up to your project, used tools, conventions, etc and has to be answered individually.