🚀 DevOps & SRE Certification Program 📅 Starting: 1st of Every Month 🤝 +91 8409492687 🔍 Contact@DevOpsSchool.com

Upgrade & Secure Your Future with DevOps, SRE, DevSecOps, MLOps!

We spend hours on Instagram and YouTube and waste money on coffee and fast food, but won’t spend 30 minutes a day learning skills to boost our careers.
Master in DevOps, SRE, DevSecOps & MLOps!

Learn from Guru Rajesh Kumar and double your salary in just one year.


Get Started Now!

Git Lab Exercise & Assignment: Local Branches with Rebasing: Part – 6


code>
# So far, each time we merged, there was a fork
# in the history. Forks for real branches are good,
# but each concurrent change doesn't need a fork.
# 1. Checkout a new branch, change new.txt
$ git checkout -b working
$ echo "line5" >> new.txt
$ git commit -a -m "Added new line5."
# 2. Checkout master, change new-b.txt
$ git checkout master
$ echo "line3" >> new-b.txt"
$ git commit -a -m "Added new-b line3."
# 3. Go back to working, note the fork
$ git checkout working
$ git l working master
# 4. Rebase your work on top of master, no more fork
$ git rebase master
$ git l working master
# 5. Checkout master, merge in working
$ git checkout master
# Note in the output it said "Fast-forward".
# Unless told --no-ff, git will avoid needless
# merge commits
$ git l
# No (unneeded) forks
Subscribe
Notify of
guest


0 Comments
Newest
Oldest Most Voted
Inline Feedbacks
View all comments

Certification Courses

DevOpsSchool has introduced a series of professional certification courses designed to enhance your skills and expertise in cutting-edge technologies and methodologies. Whether you are aiming to excel in development, security, or operations, these certifications provide a comprehensive learning experience. Explore the following programs:

DevOps Certification, SRE Certification, and DevSecOps Certification by DevOpsSchool

Explore our DevOps Certification, SRE Certification, and DevSecOps Certification programs at DevOpsSchool. Gain the expertise needed to excel in your career with hands-on training and globally recognized certifications.

0
Would love your thoughts, please comment.x
()
x