conveyal / gtfs-lib

A library for loading and saving GTFS feeds of arbitrary size with disk-backed storage
BSD 2-Clause "Simplified" License
71 stars 38 forks source link

Release #311

Closed br648 closed 3 years ago

br648 commented 3 years ago

Checklist

Description

This release PR aims to merge the following PRs into the master branch.

Relevant PRs included in this release:

JUnit Upgrade - https://github.com/conveyal/gtfs-lib/pull/309 Update high severity types - https://github.com/conveyal/gtfs-lib/pull/310

br648 commented 3 years ago

@landonreed as this is the first time doing this and because there is a merge conflict, I want to run this pass you before making any updates. This is the merge conflict in question:

<<<<<<< HEAD
  <version>6.2.3-SNAPSHOT</version>
=======
  <version>6.2.2</version>
>>>>>>> master

Is this just a case of merging master into dev, bumping the version to 6.2.3 and commiting?

landonreed commented 3 years ago

@br648, I just pushed a merge commit (https://github.com/conveyal/gtfs-lib/pull/311/commits/8d0a19fab75082bd0b196fcbcfeb3e83a4d915a1) that keeps the version at 6.2.3-SNAPSHOT. I think this was just the result of semantic-release not completing fully during the last release (e.g., the version bump commit not getting published or something of that nature).