Title: Theory / Important / CS / Softw / VCS / Git / Merge
Tags: fromMath mathToDef FromInstruction computer_to_instruction fromCommand hasNotNewEffectReturnsMeaning some_instruction instruction_to_flag

Name: A merge conflict
Definition: When a merge is tried, but the same files as been updated (differently) in the two branches since the most common ancestor.
Chapter: 3
Section: 2

Fla: merge commitRef
Effect: Merge current branch with the commit at commitRef
Prefix: git
Chapter: 3
Section: 1

Fla: mergetool
Effect: run a tool to resolve the current merge conflict
Prefix: git
Chapter: 3
Section: 2

Fla: merge
Effect: equivalent to
git merge @{u}
Prefix: git
Chapter: 3
Section: 5
Assuming: The current branch is a tracking branch

Question: How to merge pull request you received
Answer: Either click for fast-forward, if it is possible
Page: https://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
Chapter: 6
Section: 2
Answer2: create a merge-commit, pull it on your computer, merge, and push on your branch

Name: reuse record resolution
Definition: Git will keep a set of pre- and post-images from successful merges, and if it notices that there’s a conflict that looks exactly like one you’ve already fixed, it’ll just use the fix from last time, without bothering you with it.
Page: https://git-scm.com/book/en/v2/Distributed-Git-Maintaining-a-Project
Chapter: 5
Section: 3
Abbreviation: rerere

Variable: refs/pull/n/merge
Meaning: The commit that would be obtained when PR n is merged
Page: https://git-scm.com/book/en/v2/GitHub-Maintaining-a-Project
Context: github
Section: 3
Chapter: 6

Fla: -Xignore-space-change
Effect: During merge, consider that any number of space (at least 1) are equivalent
Page: https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging
Prefix: git
Chapter: 8

Fla: -Xours
Effect: In case of merge conflict, keep our version
Page: https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging
Prefix: git
Chapter: 8

Fla: -Xtheirs
Effect: In case of merge conflict, keep their version
Page: https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging
Prefix: git
Chapter: 8

Variable: merge.tool
Meaning: Tool to use to merge
Page: https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration
Context: git
Section: 1
Chapter: 8
Value: extMerge

Variable: merge.cmd.cmd
Meaning: The command to execute to merge, assuming external tool used
Page: https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration
Context: git
Section: 1
Chapter: 8

Variable: merge.extMerge.trustExitCode
Meaning: Whether exit code of the merging tool indicate whether merge was succesful
Page: https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration
Context: git
Section: 1
Chapter: 8

Instruction: pattern merge=mergeName
Page: https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#filters_a
Effect: when merging a file satisfying pattern, apply strategy mergeName
Chapter: 8
Section: 2

Variable: merge.mergeName.driver
Meaning: the command to use when merging a file with mergeName
Page: https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#filters_a
Section: 2
Chapter: 8

Variable: GIT_MERGE_VERBOSITY
Meaning: The merge verbosity
Page: https://git-scm.com/book/en/v2/Git-Internals-Maintenance-and-Data-Recovery
Context: git
Section: 7
Chapter: 10
Initialization: 2
Kind: environment variable

Name: An evil merge
Definition: A merge that introduces changes that do not appear in any parent.
Page: https://git-scm.com/docs/gitglossary
Context: git

Name: A merge
Definition: A successful merge results in the creation of a new commit representing the result of the merge, and having as parents the tips of the merged branches.
Page: https://git-scm.com/docs/gitglossary
Context: git

Name: Merging
Definition: To bring the contents of another branch (possibly from an external repository) into the current branch. In the case where the merged-in branch is from a different repository
Page: https://git-scm.com/docs/gitglossary
Context: git

Name: To octopus
Definition: To merge more than two branches
Page: https://git-scm.com/docs/gitglossary
Context: git

Name: Resolving
Definition: The action of fixing up manually what a failed automatic merge left behind.
Page: https://git-scm.com/docs/gitglossary
Context: git

Name: An unmerged index
Definition: An index which contains unmerged index entries
Page: https://git-scm.com/docs/gitglossary
Context: git

Variable: pre-merge-commit
Meaning: invoked by `git merge`. If exited with non zero, abort.
Page: https://git-scm.com/docs/gitglossary
Context: git