ChiliProject is not maintained anymore. Please be advised that there will be no more updates.

We do not recommend that you setup new ChiliProject instances and we urge all existing users to migrate their data to a maintained system, e.g. Redmine. We will provide a migration script later. In the meantime, you can use the instructions by Christian Daehn.

Merging long standing branches

Added by Eric Davis at 2011-11-11 07:29 pm

(Moved the conversation out of #692 into this thread to keep the issue focused).

Holger Just wrote:

We have spend way more time than initially planned to bring the patches to the current unstable branch.

I think we have to reduce that time for future patches, let's talk at the next team meeting what went wrong and how we can improve our process and communication. The merges and rebase attempts were a serious PITA and I wouldn't want to do something like this again (and don't wish that anyone else too).

We don't need to wait for that, it sounds like the exact same problem as with acts_as_journalized:

  • a branch was forked
  • the branch was long lived, which meant a divergence from the source branch
  • the branch had changes that impacts many parts of the system, thus merge problems

To make things even worse, this design was a long lived branch of another long lived branch (#263). The only way around this is to make smaller more frequent changes.

I'm not saying this was bad or wrong, only that because of how the design was handled we now have to do more work to get it done.

Eric Davis