Okuzeka
Software Engineering vocabulary · Version Control

Merge

Meaning in software engineering, with examples

/mɜːrdʒ/verbCore term

In software engineering, merge means: To combine the changes from one branch into another, so that both sets of work end up in the same code.

In Turkish: birleştirmek

How it is used

You merge a branch into main, merge a pull request or merge main into your own branch to get the latest changes. It is also a noun: 'a merge', 'a merge commit'.

Example sentences

  1. Don't merge yet. The tests are still running.

  2. Once you get two approvals, you can merge it into main.

  3. I merged the latest main into my branch to pick up the new config.

Common collocations

  • merge into main
  • merge a pull request
  • merge commit
  • merge the changes
  • branchA separate line of development in a repository, where you can work on changes without affecting the main code until you are ready to merge.
  • pull requestA request to merge your code changes from one branch into another, so that teammates can review and discuss them first.
  • merge conflictA situation where Git cannot combine two branches automatically because both changed the same lines, so a person has to choose the right version.
  • rebaseIn Git, to move your branch's commits so that they start from a newer point, usually the latest main, which gives a cleaner, straight-line history.
  • commitA saved snapshot of changes in a repository, with a short message that explains what was changed and why. Also used as a verb: to commit your changes.

More terms: Version Control

Practise with graded reading

Reading at the right level is the fastest way to make new words stick. Pick free English books by level: