Explore Courses Blog Tutorials Interview Questions
0 votes
in DevOps and Agile by (29.3k points)
edited by

In my repository, I have a branch called aq which I'm working on.

I then committed new work and bugs in master.

What is the best way to get those commits into the aq branch? Create another new branch out of the master and merge it with aq?

1 Answer

0 votes
by (50.2k points)

For this, you just need to check out the branch that you are working on using

git checkout <branch_name> 

Then you need to rebase this branch from the master use the following command for rebase:

git rebase master

Note: If your previous commits are public don’t do a rebase. Make sure to pull all the latest changes then pull to feature branch.

Browse Categories