Updating a feature with develop while I'm developing it. Is it Gitflow?

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:

  1. This way of working is still Gitflow? or is it a variant of it?
  2. If this way of working is not gitflow, does it have any other name?
  3. What happens if there is a bug in develop and my feature inherits it?

Best regards.

1 Like

@PaleBlueDot Welcome to the forum! Interested to hear other community member’s perspectives on this as well.

A few things I wanted to point out - if you haven’t seen the GitLab Git Flow page, you might want to check it out.

I will also share just from my own experience, that when I’m using GitLab to contribute to our handbook, I prefer to always keep my environment up to date and detail with conflicts along the way, so that I don’t have a bunch of issues to deal with at the end. I also prefer to break my merge requests into small pieces, so that I’m avoiding conflicts and iterate as much as possible.

Anyways, just my experience, and like I said, looking forward to hear what others have to say as well.