Merge feature branch to MAIN branch in gCTS fiori app

Hi,

I have implemented gCTS in S/4 HANA 2023 with a remote GitHub repository. Task based commit is enabled by implementing BADI. There is a MAIN branch in the repository. In SAP gCTS Fiori app, Developer 1 created BRANCH1 and Developer 2 created BRANCH2 in the same repository in their gCTS fiori app logins. when they started working on the same existing Z program. Automatic PUSH is switched OFF. When they released the tasks, changes are committed to the respective  BRANCH1 and BRANCH2. What is the approach to merge both BRANCH1 and BRANCH2 code into the MAIN branch in gCTS fiori app?

In opensap course, below approach is mentioned:

– In Developer’s gCTS Fiori app : Developer to merge MAIN branch to the respective BRANCH and push the new commit to REMOTE repository. And then developer to login to GitHub remote repository, do the COMPARE & PULL, MERGE etc in REMOTE GitHub repository as a collaborator. And then click on ‘Update to latest commit’ in gCTS fiori app?    

Everytime developer needs to login to Github remote repository and and do the COMPARE & PULL, MERGE etc to have up to date ‘current active commit’ of MAIN branch? Can’t we do it directly in gCTS Fiori app? Like developer 1 releases the task and open gCTS app, under branch tab, merge the BRANCH1 to MAIN branch and developer 2 also do the same? and finally push the latest local commit to remote GitHub repository?

Can you please help me understand this?

-Sunil

 

 

Scroll to Top