Exam AZ-400 topic 7 question 62 discussion

Shouldn't it be a rebase since we want to "override the history of the Git repository"? A merge will not override the history, merely add the new changes,

Correct Answer is A "Rebase"

should be Rebase then Merge

Going with A but it's not enough. This is the correct answer if we interpret the question as asking what starts the process of overriding the history. While rebase alone doesn't update the remote main branch, it sets up the rewritten history, which is a prerequisite for overriding the repository's history. To finalize the update, you would need to: 1 - Switch to the main branch. 2 - Apply the rebased changes, typically with a fast-forward or force-push. Why not Merge: Merge combines changes from two branches but does not rewrite or replace history; it creates a merge commit instead.

Overriding History: Rebasing allows you to rewrite the commit history of your branch. You can replay the commits from the experimentation branch on top of the latest commit of the main branch, effectively integrating the changes while discarding the original history of the experimentation branch.

I think it is "A. Rebase" because a merge preserves the history on the branch (assuming commits on master and experiment happened in parallel). Only Rebase will do as the question requests and "override the history" because it forces the merged branch to offer its commits AFTER the head of the main branch.

Rebase will override history. Please do not use this on commercial projects.

Given answer is correct 100%. Rebasing is the process of moving or combining a sequence of commits to a new base commit. Since you created your branch, main branch has moved, so you can rebase your branch to latest commit of main branch. This doesn't do ANYTHING to the main branch. To get changes to main branch from your feature branch, YOU HAVE TO DO A MERGE

Please update it to A.

Rebase the master branch to the feature and override the other commit present in the master after the fork of feature So rebase is the response

A. Rebase to squash all the commits in the main branch Merge will add the commit history from the feature branch onto of the main branch

https://docs.microsoft.com/en-us/azure/devops/repos/git/rebase?view=azure-devops&tabs=visual-studio-2019 "Git rebase resequences the commit history of the target branch so that it contains all source branch commits, followed by all target branch commits since the last common commit. Another way to view it is that a rebase replays the changes in your target branch on top of the source branch history" Answer is A

if it's overriding, then answer is Rebase

A is correct answer.

since yuou need to rewrite the main history you need to use a rebase. The only way to ensure to write all experimentation history in the main branch https://www.atlassian.com/git/tutorials/merging-vs-rebasing

Got this January 2022. Rebase. 100% on that part.

Rebase, naturally.