On Fri, Jun 26, 2015 at 11:22 AM, Uriy Zhuravlev <u.zhurav...@postgrespro.ru> wrote: > 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
This is an awfully strange thing to do. git checkout -b creates a new branch. Why would you create a new branch with the name remotes/origin/EDBAS9_4_STABLE? I would just do "git checkout REL9_4_STABLE" if that's what you want to do. > git merge master > MANY CONFLICTS Well, the stuff we back-patch is going to conflict if it's been adjusted at all. I think trying to do this is a bad idea. -- Robert Haas EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
