conditionally insert, update, or delete rows of a table NAME MERGE - conditionally insert, update, or delete rows of a table SYNOPSIS [ WITH with_query [, ....Run a merge for files needing merging NAME git-merge-index - Run a merge for files needing merging SY...Run merge conflict resolution tools to resolve merge conflicts NAME git-mergetool - Run merge confl...Common Git merge tool shell scriptlets NAME git-mergetool--lib - Common Git merge tool shell scriptlets SY...Produce a merge commit message NAME git-fmt-merge-msg - Produce a merge commit message SYNOPSIS git fmt-m...Reuse recorded resolution of conflicted merges NAME git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS git rerere [cl...Merge subtrees together and split repository into subtrees NAME git-subtree - Merge subtrees to...Perform merge without touching index or working tree NAME git-merge-tree - Perform merge without touchi...Run a three-way file merge NAME git-merge-file - Run a three-way file merge SYNOPSIS git merge-file [-L <current-nam...Find as good common ancestors as possible for a merge NAME git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS git......ON Git uses cryptographic signatures in various places, currently objects (tags, commits, mergetags) and transactions (pushes). In every case, the command which is about to crea…Join two or more development histories together NAME git-merge - Join two or more development histories together SYNOPSIS git merge [-n] [--stat] [--no-......[-v [--abbrev=<n> | --no-abbrev]] [--column[=<options>] | --no-column] [--sort=<key>] [--merged [<commit>]] [--no-merged [<commit>]] [--contains [<commit>]] [--no-contains [<com…...it. -t <tool>, --tool=<tool> Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and vimdiff. Run git difftool --tool-help for the list of valid <…...re are two main tools that can be used to include changes from one branch on another: git-merge (1) and git-cherry-pick (1). Merges have many advantages, so we try to solve as m…...s edit [--allow-empty] [<object>] [--[no-]stripspace] git notes show [<object>] git notes merge [-v | -q] [-s <strategy> ] <notes-ref> git notes merge --commit [-v | -q] git not…Get and set repository or global options NAME git-config - Get and set repository or global options SYNOPSIS git config list [<file-option>] [<display-option>] [--includes] git con…...ending on configuration options or command line flags, will call either git rebase or git merge to reconcile diverging branches. <repository> should be the name of a remote repo…...ream> is not specified, the upstream configured in branch.<name>.remote and branch.<name>.merge options will be used (see git-config (1) for details) and the --fork-point option…...lly update any of the files it "caches". (see: git-checkout-index (1)) Optionally, it can merge a tree into the index, perform a fast-forward (i.e. 2-way) merge, or a 3-way merg…