However, master has since progressed about 100 commits further, and there are merge conflicts now. Directly merging the old develop branch into master is thus not possible.
That’s why I’ve updated develop from master (i.e. merged master into develop), fixed the conflicts, and did some small documentation and whitespace fixes to the projects code.
Merging this PR into master will finally make the projects feature available. Also, your develop branch could then be deleted, if you’re not using it for anything else.
koalalorenzo
commented
4 years ago
As described in #318, support for DigitalOcean’s “projects” feature has been merged into the
developbranch only, not intomaster, and is thus not yet released. The only thingdevelopcontains thatmasterdoesn’t is the projects code.However,
masterhas since progressed about 100 commits further, and there are merge conflicts now. Directly merging the olddevelopbranch intomasteris thus not possible.That’s why I’ve updated
developfrommaster(i.e. mergedmasterintodevelop), fixed the conflicts, and did some small documentation and whitespace fixes to the projects code.Merging this PR into
masterwill finally make the projects feature available. Also, yourdevelopbranch could then be deleted, if you’re not using it for anything else.Let me know if you’d like anything changed.