Skip to content

Conversation

@binh-dam-ibigroup
Copy link
Collaborator

This PR resolves conflicts between the dev and master branches. Also, it uses the most recent the OTP-ui package versions.

@binh-dam-ibigroup
Copy link
Collaborator Author

@evansiroky and @landonreed I think the snapshot failure come from a change in the from icon in the FromToLocationPicker introduced with opentripplanner/otp-ui#136. We should update the snapshots to reflect that.

@evansiroky
Copy link
Contributor

In the future, we should be more cognizant of the commit messages we use.

This is not a feature in my opinion: feat: Resolve merge conflicts master <- dev

This will show up in the release notes as being a new feature, when it is really not. We should use the feat and fix commit prefix very sparingly. We shouldn't even use fix unless we are fixing a bug in the current master branch. Often times we'll use fix for "fixes" we do during PR review on stuff that is actually new features or general refactoring.

@binh-dam-ibigroup
Copy link
Collaborator Author

In the future, we should be more cognizant of the commit messages we use.

This is not a feature in my opinion: feat: Resolve merge conflicts master <- dev

This will show up in the release notes as being a new feature, when it is really not. We should use the feat and fix commit prefix very sparingly. We shouldn't even use fix unless we are fixing a bug in the current master branch. Often times we'll use fix for "fixes" we do during PR review on stuff that is actually new features or general refactoring.

Oh... interesting... sorry I thought I didn't specify a category so it might have defaulted to feat?

@landonreed
Copy link
Member

@evansiroky, agreed. This is definitely not a feature. It's probably more appropriately categorized as refactor or chore.

@landonreed landonreed merged commit d5cd66f into dev Jul 8, 2020
@landonreed landonreed deleted the dev-master-conflicts branch July 8, 2020 18:13
@landonreed
Copy link
Member

🎉 This PR is included in version 1.0.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@landonreed
Copy link
Member

🎉 This PR is included in version 1.0.0-alpha.4 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants