QuestionQ377

Software Development and Design

A developer has fixed a bug found in an application's production code. A separate file named bug427896191v_fix contains the code changes. Which Git command must be used to incorporate the bug fix into the production code?

  • A git rebase
  • B git cat-file
  • C git merge-file
  • D git bisert
Explanation

git merge-file performs a three-way file merge. It incorporates the changes made from a base file to another file into the current file, which is the appropriate operation for integrating a separately prepared bug-fix file into the production code.

Learn more

Community Discussion

No comments yet. Be the first to start the discussion!