mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
.github
config
contrib
doc
src
KNOWN_BUGS
MISSING_FEATURES
Makefile
TODO
src
.cirrus.star
.cirrus.tasks.yml
.cirrus.yml
.dir-locals.el
.editorconfig
.git-blame-ignore-revs
.gitattributes
.gitignore
COPYRIGHT
GNUmakefile.in
HISTORY
Makefile
README.md
aclocal.m4
configure
configure.ac
meson.build
meson_options.txt
The conflict types 'update_differ' and 'delete_differ' indicate that a row to be modified was previously altered by another origin. Rename those to 'update_origin_differs' and 'delete_origin_differs' to clarify their meaning. Author: Hou Zhijie Reviewed-by: Shveta Malik, Peter Smith Discussion: https://postgr.es/m/CAA4eK1+HEKwG_UYt4Zvwh5o_HoCKCjEGesRjJX38xAH3OxuuYA@mail.gmail.com