Search notes:

merge [git]

Unless fast-forward, a (successful) merge results in the creation of a new commit. This commit has as parents the tips of the merged branches.

Merge strategies

octopus

Merging more than two branches.

resolve

When a merge failed, it must manually be resolved.

recursive

Used by git by default.

ours

subtree

custom?

Used for example with binary files. The user provides the merge mechanisms.

Starting over a merge that resulted in conflicts

git reset

See also

merge, pull, git merge-tree, git merge-file, git rerere, git merge-base, git mergetool

Index

Fatal error: Uncaught PDOException: SQLSTATE[HY000]: General error: 8 attempt to write a readonly database in /home/httpd/vhosts/renenyffenegger.ch/php/web-request-database.php:78 Stack trace: #0 /home/httpd/vhosts/renenyffenegger.ch/php/web-request-database.php(78): PDOStatement->execute(Array) #1 /home/httpd/vhosts/renenyffenegger.ch/php/web-request-database.php(30): insert_webrequest_('/notes/developm...', 1759398444, '216.73.216.42', 'Mozilla/5.0 App...', NULL) #2 /home/httpd/vhosts/renenyffenegger.ch/httpsdocs/notes/development/version-control-systems/git/merge(71): insert_webrequest() #3 {main} thrown in /home/httpd/vhosts/renenyffenegger.ch/php/web-request-database.php on line 78