The Nautilus application development team has been working on a project repository /opt/news.git. This repo is cloned at /usr/src/kodekloudrepos on storage server in Stratos DC. They recently shared the following requirements with the DevOps team:
There are two branches in this repository, master and feature. One of the developers is working on the feature branch and their work is still in progress, however they want to merge one of the commits from the feature branch to the master branch, the message for the commit that needs to be merged into master is Update info.txt. Accomplish this task for them, also remember to push your changes eventually.
ssh natasha@ststor01
sudo su -
cd /usr/src/kodekloudrepos/
ls
news
cd news
git branch
* feature
master
git log --oneline
6173086 (HEAD -> feature, origin/feature) Update welcome.txt
2da683a Update info.txt
56ce4e2 (origin/master, master) Add welcome.txt
c4b18a6 initial commit
# Need to move to the master branch
git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'
# Grab the reference num for the Update info.txt
git cherry-pick 2da683a
[master 89690e6] Update info.txt
Date: Fri Sep 19 15:37:16 2025 +0000
1 file changed, 1 insertion(+), 1 deletion(-)
git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 16 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 316 bytes | 316.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
To /opt/news.git
56ce4e2..89690e6 master -> master
# Verify the changes by looking in the directory
ls
info.txt welcome.txt