doctrine / data-fixtures

Doctrine2 ORM Data Fixtures Extensions

http://www.doctrine-project.org

MIT License

2.78k stars 224 forks source link

Merge release 1.3.3 into 2.0 #326

Closed doctrinebot closed 4 years ago

doctrinebot commented 4 years ago

Release 1.3.3

1.3.3

Total issues resolved: 0
Total pull requests resolved: 1
Total contributors: 1

Improvement

323: Fix travis build thanks to @alcaeus

Ocramius commented 4 years ago

This is obviously the "usual mess" - we haven't used merge-up strategy so far, so this patch is clear conflict with everything in the 2.0 branch

Ocramius commented 4 years ago

Note: branch 1.4.x does not exist at this point in time, but many milestone items are already in it: need to discuss branching strategy on this particular repository.

alcaeus commented 4 years ago

2.0 had its last activity 2 years ago, so I'd say we disregard that for now. master currently is 1.4.x-dev and has been used as such.

For the time being, I'd close this PR and re-analyse the 2.0 branch to see if we can pick up the work again.

Ocramius commented 4 years ago

Renaming 2.0 to next (both branch and milestone) could also make things more manageable for the time being

alcaeus commented 4 years ago

2.0 branch re-pushed as next as to not confuse our bot. Closing here.