[wp-trac] [WordPress Trac] #46028: Block Editor: Unable to enable Custom Fields due to out-of-order merges

[WordPress Trac]

#46028: Block Editor: Unable to enable Custom Fields due to out-of-order merges
--------------------------+--------------------
 Reporter:  dd32          |      Owner:  (none)
     Type:  defect (bug)  |     Status:  new
 Priority:  normal        |  Milestone:  5.1
Component:  Editor        |    Version:  trunk
 Severity:  normal        |   Keywords:
  Focuses:                |
--------------------------+--------------------
 After switching WordPress.org from `/branches/5.0` to `/trunk` it appears
 that we lost the ability to enable Custom Fields.

 Upon [https://wordpress.slack.com/archives/C02RQBWTW/p1547780595404100
 digging into it(slack)] I've realised that two merge commits were done in
 such a way that a later merge commit brought over an older commit that had
 been covered by an earlier merge, specifically:

  - [44244] merged in [43885/branches/5.0/src/wp-admin/includes/meta-
 boxes.php]
  - [44260] merged in [43861/branches/5.0/src/wp-admin/includes/meta-
 boxes.php] which overwrite the newer commit above

-- 
Ticket URL: <https://core.trac.wordpress.org/ticket/46028>
WordPress Trac <https://core.trac.wordpress.org/>
WordPress publishing platform