Multiple feature branches and continuous integration

Question

I\'ve been doing some reading about continuous integration recently and there is a scenario which could occur which I don\'t understand how to deal with appropriately.

W

Answer 1

I think they mean merging mainline into the feature branch, not the other way 'round. This way, the feature branch will not deviate from mainline too much, and be kept in an easily mergeable state.

The git folks do the same thing by rebasing feature branches on top of the master branch before submitting a feature.