On Wed, Jan 4, 2017 at 10:05:10AM -0500, Tom Lane wrote: > Andres Freund <and...@anarazel.de> writes: > > On 2017-01-03 13:02:28 -0500, Bruce Momjian wrote: > >> Yeah, I was doing parallel pulls of different branches in git via shell > >> script, and it seems the size of this commit showed me that doesn't > >> work. Sorry. > > > Shouldn't you check the results of something like this before pushing? > > Sorry for piling on, but that seems like a quite critical step. > > Actually, my takeaway from this was "don't ever use git reset on the repo". > "git revert" would have been much safer. Yeah, it would have meant that > git blame on the 9.2 branch would have some useless noise, but how much > does anyone still care about that?
FYI, my takeaway is that you can't run parallel 'git pull' operations on different branches checked out of the same tree, at least as setup from instructions on our wiki. Such parallel operations generate messages indicating someone else is working on the tree, but I now realize those are _warnings_ and this behavior should be avoided. Normally it works fine, but for a big commit, it can move a changeset from one branch to another, with disastrous consequences. Yes, I should have checked more, but I often do a pull before a push as another check, so that can mess it up too. Basically, if your tools are being used improperly, checking can make things worse too. -- Bruce Momjian <br...@momjian.us> http://momjian.us EnterpriseDB http://enterprisedb.com + As you are, so once was I. As I am, so you will be. + + Ancient Roman grave inscription + -- Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-committers
