search

datamade / django-councilmatic

:heartpulse: Django app providing core functions for *.councilmatic.org
http://councilmatic.org
MIT License
26 stars 16 forks source link

make 2.5 master #269

Closed fgregg closed 3 years ago

fgregg commented 3 years ago

would it be possible to merge the 2.5 branch into master? it would be one less thing for me to remember to do every occasional time I come to this repo?

If we can't do that for some reason, can we make 2.5 the default branch?

Screenshot_2020-08-04 datamade django-councilmatic

hancush commented 3 years ago

Oh, great question (and I have the same problem 😅).

IIRC, we're maintaining the 0.x series on master because NYC still relies on it, and merging 2.5 would make it difficult to patch bugs to the legacy version. With that said, AFAIK, we don't have a current maintenance agreement for NYC, and package versions are EOL'ed all the time.

So, if we're prepared to say we're no longer developing the 0.x version of django-councilmatic, then I think we can merge. If not, I'd be fine switching the default branch!

Thoughts, @fgregg?

fgregg commented 3 years ago

let's merge!

fgregg commented 3 years ago

let's please do this so code search will work, LOL.

fgregg commented 3 years ago

it ended up that there were merge conflicts with master. I didn't want to deal with those right now, so I ended up making 2.5 the default branch for github. this addresses the annoyances that we had, I think @hancush