Closed
Conversation
Contributor
mivola
commented
Dec 12, 2018
mivola
commented
- changing the return value of getters from void to the appropriate object in the model classes
- changing the return value of getters from void to the appropriate object in the model classes
This was referenced Dec 12, 2018
Closed
Contributor
Author
|
@khmarbaise I've seen you had been working on some issues in the past few days - could you maybe also have a look at my pull requests? |
Member
|
I will try...can you check the conflicts... |
Contributor
Author
|
I'd like to work on the conflicts. The problem is: how to get the changes from your (the upstream) repo to my fork? I tried various ways (https://help.github.com/en/articles/syncing-a-fork, https://github.com/KirstieJane/STEMMRoleModels/wiki/Syncing-your-fork-to-the-original-repository-via-the-browser) but it always ends up with a merge - which is something you do not want IIRC... |
Contributor
Author
|
I just created a new PR (#403) to avoid cluttering the git repo. Maybe you could merge this before any other changes? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.