eh, 85 Commits behind?
-
- Posts: 139
- Joined: Sat Jan 02, 2016 9:19 pm
eh, 85 Commits behind?
That was a surprise did something happen over the last week?
- evilhero
- Site Admin
- Posts: 2887
- Joined: Sat Apr 20, 2013 3:43 pm
- Contact:
Re: eh, 85 Commits behind?
Yeah, the config-upgrade branch got merged into development. It was such a big code change that it required it's own testing branch that was being tested by several users over the past 2 weeks or so. Now that it's in development, everyone can reap the rewards of the test crew.
The ~85 commits was mainly due to some merging problems that were happening due to the new branch. There were some weird git merge problems and I just ended up committing it as it was in order to try and fix things going forward. More than one gent did some PR's for improvements into the new branch, and getting the commits all straightened out so we could patch in fixes, etc into that branch was pretty important while still including all their work - thus why I just pushed it as is.
If you want to get a general overview of the changes - check out the changelog here
The ~85 commits was mainly due to some merging problems that were happening due to the new branch. There were some weird git merge problems and I just ended up committing it as it was in order to try and fix things going forward. More than one gent did some PR's for improvements into the new branch, and getting the commits all straightened out so we could patch in fixes, etc into that branch was pretty important while still including all their work - thus why I just pushed it as is.
If you want to get a general overview of the changes - check out the changelog here
-
- Posts: 139
- Joined: Sat Jan 02, 2016 9:19 pm
Re: eh, 85 Commits behind?
I tweeted you how stable the code had been. Nice work. Although the Doomsday Clock Comic kills the service! Seriously, add the Comic and see