Conflict between REL9_4_STABLE and master branch.

From: Uriy Zhuravlev <u(dot)zhuravlev(at)postgrespro(dot)ru>
To: pgsql-hackers(at)postgresql(dot)org
Subject: Conflict between REL9_4_STABLE and master branch.
Date: 2015-06-26 15:22:53
Message-ID: 2055276.aPEAkX9pnG@dinodell
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-hackers

Hello hackers.

I found a strange thing. I hope it's not on purpose.

Example:
git clone git://git.postgresql.org/git/postgresql.git
cd postgresql
git checkout -b remotes/origin/REL9_4_STABLE
git merge master
MANY CONFLICTS

Why?

Thanks.
--
Uriy Zhuravlev
Postgres Professional: http://www.postgrespro.com
The Russian Postgres Company

Responses

Browse pgsql-hackers by date

  From Date Subject
Next Message Robert Haas 2015-06-26 15:28:54 Re: less log level for success dynamic background workers for 9.5
Previous Message Robert Haas 2015-06-26 15:10:34 Re: WIP: Enhanced ALTER OPERATOR