+ Start a Discussion

Jenkins ANT GitHub merge problem

Hello ,
We are configuring continuous integration for our project. For this purpose we are using Jenkins(Continuous integration tool),ANT (Force.com deployment),GitHub (Source code repository).

We have one AD(development team) team and support (Maintenance Team) team ,both are having different sandboxes and their respective changes will be merged in SIT sandbox. Assume that both AD team and AM team have changed the same Apex class then this class must be merged in SIT sandbox.

The problem is how can we merge AD team's GitHub code repository and AM team's GitHub code repository into SIT GitHub code repository within Jenkins configuration.

Please help us to resolve this.