Comments by "" (@diadetediotedio6918) on "Git Flow is Bad | Prime Reacts" video.

  1. This appears to me that is a problem of your project and team. In my work we used git flow on a daily basis for months and haven't much of these problems, they only happens when someone starts making changes and not updating his branch Ideally, you should update your feature branch if it lives long enought with develop, and then at the end the conflicts would be inexisting or minimal
    2
  2. It seems to me that this whole discussion is really pointless. It's pretty straightforward to work with the feature model, and it doesn't tend to cause as much conflict or unsyncing that people who advocate it do say, it's just a matter of making "features" point and to the point, and when features get long enough you merging, not the feature into the dev, but the dev into the feature, thus keeping the two in sync in exactly the same way as if it were a short feature, but without the problem of merging something incomplete into the dev. Briefly For quick and simple features: 1d. feature -> dev / Fast, easy and straightforward, you developed it and then integrated it For longer, more complex features that require intermediate steps that are impossible to skip: 1d. feature 2d. dev -> feature / Keeps the feature in sync with changes in the dev, fixes any conflicts that appear (which should be rare) 3d (finished). feature -> dev / Finished, will probably not have any conflicts and will be complete in the sense that it resolves a given change completely
    1