Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Proposal for a TripStatusGroup #38

Merged
merged 1 commit into from
May 15, 2020
Merged

Proposal for a TripStatusGroup #38

merged 1 commit into from
May 15, 2020

Conversation

skinkie
Copy link
Contributor

@skinkie skinkie commented Sep 18, 2019

No description provided.

@skinkie skinkie added the enhancement New feature or request label Sep 18, 2019
@skinkie skinkie self-assigned this Sep 18, 2019
@skinkie skinkie added this to the v.1.1 milestone Sep 18, 2019
@pvgrumbkow
Copy link
Contributor

@skinkie, this pull request is apparently based on master, right? Could you base it on v1.1 instead?

@skinkie skinkie merged commit a39103a into VDVde:master May 15, 2020
@sgrossberndt
Copy link
Contributor

Why was this "Proposal" merged to master instead of changes_for_v1.1? :(

@skinkie
Copy link
Contributor Author

skinkie commented Nov 10, 2020

@sgrossberndt you can revert it if you want...

@sgrossberndt
Copy link
Contributor

Should have been in v1.1, have a better commit message and as
https://github.com/VDVde/OJP/blob/changes_for_v1.1/.travis/travis-ci_git-commit.sh#L40
has not been adapted in master
https://github.com/VDVde/OJP/blob/master/.travis/travis-ci_git-commit.sh#L46
we now even have a Travis CI commit in master formatting all xml/xsd files:
2c5d18b

I know you should not do it, but nevertheless I propose to force push to master to remove both commits (and open a pull request for changes_for_v1.1 of fa5adc2 before).
The other option (B) would be to revert both commits in one and fix https://github.com/VDVde/OJP/blob/master/.travis/travis-ci_git-commit.sh#L46 which will lead to lots of files being changed forth and back.

What is your opinion on this, @skinkie , @pvgrumbkow , @herlitze , @ue71603 ?

@pvgrumbkow
Copy link
Contributor

Option A sounds easier if it done correctly.

@sgrossberndt
Copy link
Contributor

Done: 471ce64

sgrossberndt pushed a commit that referenced this pull request Nov 11, 2020
@skinkie @sgrossberndt
Proposal for a TripStatusGroup (#38)
aea0113
@sgrossberndt
Copy link
Contributor

Created a pull request for changes_for_v1.1: #116
It contains an additional commit: 1cacd36

sgrossberndt pushed a commit that referenced this pull request Nov 23, 2020
@skinkie @sgrossberndt
Proposal for a TripStatusGroup (#38)
aab67d0
sgrossberndt added a commit that referenced this pull request Dec 3, 2020
@sgrossberndt @skinkie
Add TripStatusGroup (#116)
68964f8 
* Proposal for a TripStatusGroup (#38)
* Change "Unable" to "Infeasible"

Co-authored-by: Stefan de Konink <stefan@konink.de>
This was referenced Nov 9, 2023
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@herlitze herlitze herlitze approved these changes

@pvgrumbkow pvgrumbkow pvgrumbkow approved these changes

@sgrossberndt sgrossberndt Awaiting requested review from sgrossberndt

Assignees

@skinkie skinkie

Labels
enhancement New feature or request
Projects
None yet
Milestone
v1.1
Development

Successfully merging this pull request may close these issues.
4 participants
@skinkie @pvgrumbkow @sgrossberndt @herlitze