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.

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

Fixed interaction with the server share in the auto annotation plugin #468

Merged
merged 1 commit into from
Jun 4, 2019

Conversation

bsekachev
Copy link
Member

@bsekachev bsekachev commented Jun 3, 2019

Resolved #466

We also need to create the new release

@nmanovic
Copy link
Contributor

nmanovic commented Jun 3, 2019

@bsekachev, hotfix branch should be forked from master and contain only "minor changes" to fix a specific issue. It seems you forked it from develop. Nobody has tested develop well yet.

@bsekachev
Copy link
Member Author

@nmanovic
Actually I did the changes in the develop branch, next I checkout to the master and forked the hotfix branch from it. Finally I cherry-picted the commit with changes from the develop branch. It seems to be github considers such case like fork from develop whereas my local git application shows me all as expected.
It is confusing, but anyway I'll fix it.

@bsekachev
Copy link
Member Author

@nmanovic Done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants