In the 2.x branch of features conflict handling is done in the UI and it's a feature of features to add conflicts.
(With default-providing modules like commerce or distributions it is a showstopper not to do.)

Thus implementors of the features export hook should ignore conflicts.
See parent issue: #1986316: Features created with "Allow conflicts to be added" do not actually export conflicted elements

CommentFileSizeAuthor
#2 entity-2342309-2-Allow-features-conflicts.patch2.15 KBgeek-merlin
#1 entity-2342309-1-Allow-features-conflicts.patch1.92 KBgeek-merlin
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

geek-merlin’s picture

geek-merlin
they/omg
Primary language German
Location Freiburg, Germany
CreditAttribution: geek-merlin commented
Status: Active » Needs review
FileSize
entity-2342309-1-Allow-features-conflicts.patch1.92 KB

Patch flying in that might fix this.

geek-merlin’s picture

geek-merlin
they/omg
Primary language German
Location Freiburg, Germany
CreditAttribution: geek-merlin commented
FileSize
entity-2342309-2-Allow-features-conflicts.patch2.15 KB

Rebased to current dev.

Chris Matthews’s picture

Chris Matthews CreditAttribution: Chris Matthews as a volunteer commented

The 2 year old patch in #2 to entity.features.inc applied cleanly to the latest entity 7.x-1.x-dev and (if still relevant) needs review.