Git Merge Branches Kodekloud


Question: The Nautilus application development team has been working on a project repository /opt/cluster.git. This repo is cloned at /usr/src/kodekloudrepos on storage server in Stratos DC. They recently shared the following requirements with DevOps team:

a. Create a new branch xfusion in /usr/src/kodekloudrepos/cluster repo from master and copy the /tmp/index.html file (on storage server itself). Add/commit this file in the new branch and merge back that branch to the master branch. Finally, push the changes to origin for both of the branches.


ssh into storage server

ssh [email protected]

Login as root

sudo su

Go to repository

cd /usr/src/kodekloudrepos/cluster

Create new branch

git checkout -b xfusion

Copy index.html

 cp /tmp/index.html .

Add, commit, merge, push

git add .

git commit -m "added index.html"

git checkout master

git merge xfusion

git push origin xfusion

git push origin master

Share on Google Plus

About Ashadullah Shawon

I am Ashadullah Shawon. I am a Software Engineer. I studied Computer Science and Engineering (CSE) at RUET. I Like To Share Knowledge. Learn More: Click Here
    Blogger Comment
    Facebook Comment


Post a Comment