We implemented a process so all the code in development branch will be automatically merged to the release branch. After automatic merge, we publish a report highlighting the conflicts which arose out of auto merge and ask developers to manually resolve those conflicts. We have observed that there are occasions where auto merge utility actually stripped or inserted some code by itself and that resulted in bugs in release

branch. These also do not appear in the conflict report – only way we catch them today is by having quality team filing bugs and engineers fixing them in release branch (and in that process, complain!).

Areas I am looking for help on:

1. Is there a solution available to the auto merge problem?

2. Is there a way to generate a report of these differences (where auto merge stripped / inserted code) so we can catch them before spending quality engineer's time on it?

Suman