According to me, you should start by saying git rebase is a command which will merge another branch into the branch where you are currently working, and move all of the local commits that are ahead of the rebased branch to the top of the history on that branch.
Now once you have defined Git rebase time for an example to show how it can be used to resolve conflicts in a feature branch before merge, if a feature branch was created from master, and since then the master branch has received new commits, Git rebase can be used to move the feature branch to the tip of master.
The command effectively will replay the changes made in the feature branch at the tip of master, allowing conflicts to be resolved in the process. When done with care, this will allow the feature branch to be merged into master with relative ease and sometimes as a simple fast-forward operation.
Posted Date:- 2021-10-06 08:05:02
What is the concept of sudo in Linux?
Have you heard about Ansible Galaxy? What does it do?
Can you tell me what a Puppet codedir is?
What is a Puppet Module? How is it different from the Puppet Manifest?
I have 40 jobs in the Jenkins dashboard and I need to build them all at once. Is it possible?
Explain Pair Programming with reference to DevOps
Name two tools which are used for docker networking.
What is the easiest method to build a small cloud?
What is post mortem meeting with reference to DevOps?
Explain Blue/Green Deployment Pattern
When a server gets shut down does data stored in Memcached is still available?
Explain how Memcached should not be used?
Explain what Dogpile effect is? How can you prevent this effect?
Describe the difference between driver.close() and driver.quit().
Can you tell me, what Continuous Testing and Automation Testing are?
I want to move or copy Jenkins from one server to another. Is it possible? If yes, how?
How is a bare repository different from the standard way of initializing a Git repository?
How do you push a file from your local system to the GitHub repository using Git?
Can you explain the architecture of Jenkins?
What is Git rebase and how can it be used to resolve conflicts in a feature branch before merge?
What is the concept behind sudo in Linux OS?
Do you know about post mortem meetings in DevOps?
Explain how you can update Memcached when data changes?
Explain the difference between a centralized and distributed version control system (VCS).
What is Git bisect? How can you use it to determine the source of a (regression) bug?
Explain how you can minimize the Memcached server outages?
Can you tell me some advantages of Forking Workflow over other Git workflows?
How do you handle the merge conflicts in Git?
How do you squash last N commits into a single commit?
Which VCS tool you are comfortable with?
How is IaC implemented using AWS?
Name three important DevOps KPIs.
What are the benefits of using version control?
What is the role of AWS in DevOps?
What are the anti-patterns of DevOps?
How will you approach a project that needs to implement DevOps?
Can you say something about the DevOps pipeline?
Mention some of the core benefits of DevOps.
What are the various branching strategies used in the version control system?