Is it ok to regularly pull develop into a feature branch during development?

[umar....@gmail.com]

When using Git Flow as part of a development team, what are the general thoughts on regularly keeping your feature branch in sync with develop by pulling from develop and merging into your feature branch?

One disadvantage is that the history gets a bit messy.

One advantage is you get to sort out merge conflicts as an ongoing process rather than dealing with it at the end.

Curious as to what the pros and cons are. Is the answer 'it depends' - for example on how long the feature branch has been open etc.?

[Fred Condo]

In our small group of developers, we routinely *rebase* features on develop. This gets you the conflict resolutions without the complex history. The downside is that you need everyone to be savvy enough to have autosetuprebase=always or always use git pull --rebase.