Skip to content

Conversation

@LeszekSwirski
Copy link
Contributor

No description provided.

@Yanpas
Copy link
Contributor

Yanpas commented Jan 23, 2019

I've resolved conflicts in my branch https://github.com/Yanpas/vscode-ccls/commits/dataflow

@LeszekSwirski
Copy link
Contributor Author

Thanks! Unfortunately the ccls side of this feature is still not 100% functional, so it may stay stale for a while. Do you want me to pull in your changes into this PR?

@Yanpas
Copy link
Contributor

Yanpas commented Jan 23, 2019

I think it's good idea. It would be easier to start again with current master and force-push it to this remote branch

@Yanpas Yanpas mentioned this pull request Jan 29, 2019
@MaskRay MaskRay force-pushed the master branch 4 times, most recently from bedca05 to 2a41a8f Compare April 8, 2019 14:29
@MaskRay MaskRay force-pushed the master branch 2 times, most recently from ec3c887 to c144a58 Compare October 15, 2019 06:48
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