My team and I are looking for a git workflow for demoing experimental changes/features in our web application before they are released. Our audience includes our project manager and designer -- people who we do not expect to run an instance of our app -- so we need to host the webserver as well.

In our first attempt, we created a demo branch and merged in our feature branches as changes were ready to be shared. After a change was approved, the feature branch was to be merged into master and released. Unfortunately, we found that keeping demo up to date with master consistently resulted in merge conflicts.

We could do something like each feature branch gets its own instance of our application, but the ideal would be grouping all demo features together and serving them in one place.

Does anyone have any advice?

My team and I are looking for a git workflow for demoing experimental changes/features in our web application before they are released. Our audience includes our project manager and designer -- people who we do not expect to run an instance of our app -- so we need to host the webserver as well.

In our first attempt, we created a demo branch and merged in our feature branches as changes were ready to be shared. After a change was approved, the feature branch was to be merged into master and released. Unfortunately, we found that keeping demo up to date with master consistently resulted in merge conflicts.

We could do something like each feature branch gets its own instance of our application, but the ideal would be grouping all demo features together and serving them in one place.

Does anyone have any advice?

EDIT: For clarification, the merge conflicts seem to be the result of files being changed on both master and demo. Our feature branches tend to be long-lived (say, around a week while things are tweaked), and inevitably bug fixes/other changes are made to master in the mean time.