Code

BUG: 27453 right merge order#31278

Code

Merged

jreback merged 15 commits intopandas-dev:masterpandas-dev/pandas:masterfrom MarcoGorelli:27453-right-merge-orderMarcoGorelli/pandas:27453-right-merge-orderCopy head branch name to clipboardMar 26, 2020

+112-14

Commits

Commits on Feb 13, 2020

• add failing test to check row order preservation

  Show description for f81c4ee
  

  Nico Cernek

  authored and

  Marco Gorelli

  committed
  f81c4ee

• 🔀 fix conflicts, fix nameerror in tests

  

  Marco Gorelli

  committed
  25f7e03

• 📝 add whatsnew entry to v1.0.1

  

  Marco Gorelli

  committed
  a53cc22

• pass to _factorize_keys

  

  Marco Gorelli

  committed
  2d77a5c

• Add tests with merging on index, using original OP's example as test

  

  Marco Gorelli

  committed
  bab654e

• fix whatsnew ipython directive

  

  Marco Gorelli

  committed
  714f5b4

Commits on Mar 3, 2020

• Merge branch 'master' into 27453-right-merge-order

  MarcoGorelli

  authored
  ff236a8

Commits on Mar 15, 2020

• Merge remote-tracking branch 'upstream/master' into 27453-right-merge-order

  MarcoGorelli

  committed
  d7e2db9

• Add docstring and types

  MarcoGorelli

  committed
  c83f46f

• remove unnecessary test, remove test that doesn't fail on master

  MarcoGorelli

  committed
  65c3226

• Add docstring

  MarcoGorelli

  committed
  0e2c529

Commits on Mar 25, 2020

• Merge remote-tracking branch 'upstream/master' into 27453-right-merge-order

  MarcoGorelli

  committed
  0cc79a9

• use cast in categorical case

  MarcoGorelli

  committed
  711d37c

Commits on Mar 26, 2020

• Merge remote-tracking branch 'upstream/master' into 27453-right-merge-order

  MarcoGorelli

  committed
  511dade

• reword titles in whatsnew (v1.0.x -> previous behavior)

  MarcoGorelli

  committed
  aaf542e