When I create a feature, I create a branch from develop. Then when the functionality is finished, I merge it to develop but there are many conflicts because develop has been updated with other functionalities.
What my team has recommended to me is to constantly update develop and immediately merged to the feature I’m developing.
That way I wouldn’t have as many conflicts when I merge the feature when it’s done.
My questions are:
- This way of working is still Gitflow? or is it a variant of it?
- If this way of working is not gitflow, does it have any other name?
- What happens if there is a bug in develop and my feature inherits it?