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

Sync with upstream? #84

Closed
msva opened this issue Dec 21, 2019 · 5 comments
Closed

Sync with upstream? #84

msva opened this issue Dec 21, 2019 · 5 comments

Comments

@msva
Copy link
Contributor

msva commented Dec 21, 2019

It seems, Mike pulled some PRs, and commited some changes in 2.1 branch (well, actually, in 2.0 too) few weeks ago.
Wouldn't you pull changes here?
@thibaultcha
Copy link
Member

Sure. Please allow for some time.

@agentzh
Copy link
Member

agentzh commented Jan 3, 2020

Already sync'd in the v2.1-agentzh branch. Sorry for the delay on our side.

@agentzh agentzh closed this as completed Jan 3, 2020
@exjesper
Copy link

exjesper commented Jan 6, 2020

Hi @agentzh, I noticed the sync reverted a bunch of other fixes but couldn't find any ticket explaining why they were reverted. Is it documented somewhere?

@agentzh
Copy link
Member

agentzh commented Jan 7, 2020

@exjesper Because those bugs were already fixed in (slightly) different ways in the upstream repo. I had to revert them before the merge to minimize merge conflicts.

@exjesper
Copy link

exjesper commented Jan 8, 2020

OK, make sense. Thanks for the update

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@agentzh @msva @thibaultcha @exjesper