RI & FI

RI (Reverse Integration) / FI (Forward Integration)

RI :child branch => parent branch

FI :parent branch =>child branch

 

FI: This is the process where a given branch is merged with the contents of a Parent branch (for example, you FI SQL/Main to Improvement X). This is done to re-base your codebase on the current baseline. It includes an automatic step, and possibly manual resolution steps - if there are conflicting changes to be merged.

 

RI: Reverse Integration is the merging of code from a child branch into a parent branch (for example, Improvement X RIs to SQL/Main). The typical process for RI is to perform an FI, resolve the conflict, build and perform QA required steps, then reverse integrate the changes.