Skip to content
This repository was archived by the owner on Nov 2, 2022. It is now read-only.

Conversation

@antercepter
Copy link

No description provided.

@antercepter antercepter force-pushed the remove-gcm-from-project branch from fce8938 to d3a5ad4 Compare October 25, 2018 17:50
@VoliKoN
Copy link
Contributor

VoliKoN commented Oct 25, 2018

Thanks!
Please merge master into your branch and resolve conflicts

@antercepter antercepter force-pushed the remove-gcm-from-project branch 4 times, most recently from 04a5620 to 8c312b7 Compare October 25, 2018 19:50
@antercepter
Copy link
Author

I don't get what the problem, I removed these files and there should be any conflicts. When I rebase onto master, it's is up to date 🤔

@VoliKoN
Copy link
Contributor

VoliKoN commented Oct 25, 2018

Maybe you tried merging your repo's master instead of PushFish:master?
I can still see: This branch has conflicts that must be resolved

@Leopere Leopere added duplicate This issue or pull request already exists help wanted Extra attention is needed Hacktoberfest and removed duplicate This issue or pull request already exists labels Oct 26, 2018
@Leopere
Copy link
Contributor

Leopere commented Oct 26, 2018

Thanks, @antercepter for your submission submissions solving these issues are really helping get us past any of the excuses we might have for taking our time! Very powerful stuff, can't wait for the merge to be accepted.

@Leopere Leopere added the enhancement New feature or request label Oct 26, 2018
@antercepter antercepter force-pushed the remove-gcm-from-project branch from 8c312b7 to 760e319 Compare October 26, 2018 07:33
@antercepter
Copy link
Author

Conflicts were fixed, force pushed

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancement New feature or request Hacktoberfest help wanted Extra attention is needed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants