How do I merge a feature branch to the master using Git

Dave_Evers · May 25, 2019, 3:52am

Katalon Studio, Version: 6.1.5, Build: 3

How do I use Katalon > Git to merge a feature branch to the master branch?

I’ve checked out the master and tried merging the feature into the master but that did not work.

I’ve also searched the Internet for a solution but have not been successful to-date.

Timo_Kuisma · May 25, 2019, 5:27am

hello,

read this site

Dave_Evers · May 25, 2019, 3:38pm

Thanks for your reply Timo , but I am looking for information about how to do the merge from within Katalon Git, so that I can share the information with our junior QA automation team. Do does anyone from the Katalon community know how to accomplish this?

Best regards,
Dave

Timo_Kuisma · May 25, 2019, 7:09pm

hello boy,

Git is git where it is.
Open your Git bash shell and navigate to your Katalon project folder where your git is
and do all tricks there

kazurayam · May 25, 2019, 9:43pm

In Eclipse and Katalon Studio, everyone uses EGit to operate Git repositories. How to merge? See the following section:
https://wiki.eclipse.org/EGit/User_Guide#Merging_a_branch_or_a_tag_into_the_current_branch

Dave_Evers · May 26, 2019, 3:11am

Thanks kazurayam!

Exactly what I was looking for.

Best regards,
Dave

Dave_Evers · June 3, 2020, 8:22pm

To merge changes from a WorkingBranch to Master do the following:

Click Git > “Manage Branches” > “Advanced”
Checkout “Master”
Click Git > “Show History”
If required click on the “Show All Branches and Tags” icon/button
Right click on the “WorkingBranch” and click “Merge”
Push Master to remote