An engineer who is new to Git wants to bring the latest commits from main into a feature branch in a Databricks Git folder. Teammates also work on that feature branch. Which Git folders operation does Databricks recommend?
Choose an answer to check it. Afterward, select any option to review its explanation.
Merge combines main's history into the feature branch without rewriting commits or force pushing, so teammates' copies of the branch stay consistent.
Reset replaces the branch with main's state and force pushes it, discarding the feature work rather than bringing main into it.
Sparse checkout limits which directories are cloned, for large repositories; it doesn't integrate commits between branches.
Rebase also integrates main and gives a linear history, so it is tempting; but Git folders then force push and the rewritten history can cause versioning issues for the teammates on that branch.
id q947714ffa1