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

Merged a lot of PRs #80

Open
wants to merge 23 commits into
base: 2.0/develop
Choose a base branch
from
Open

Merged a lot of PRs #80

wants to merge 23 commits into from

Conversation

bhaskarvk
Copy link

I've merged PRs
#46
#48
#50
#51
#60
#75
#76
#77
#78

and also fixed the examples.

@george-silva
Copy link

@bhaskarvk can you direct that to the new repo?

@bhaskarvk
Copy link
Author

Will do

@bhaskarvk
Copy link
Author

Actually I can't, because your repo is not a proper fork of original repo. So GH is not allowing me to create a PR on your repo. Could you make your repo a fork of the original repo, that way I can submit a PR on your repo.

@george-silva
Copy link

george-silva commented Dec 2, 2016

@bhaskarvk I asked GitHub to detach the fork, because without that, I would not be able to create issues.

If it's not too much work, I can give you permission on the repo, and you can merge (if everything is tested and ok), directly in the repository. That would make you a contributor as well ;)

You basically would just add a new remote and push to it.

@bhaskarvk
Copy link
Author

bhaskarvk commented Dec 3, 2016

Could I make an alternate suggestion ? Even if your repo is detached from this repo, you can still add this repo as an upstream repo to your local checkout.

git remote add upstream https://github.com/lvoogdt/Leaflet.awesome-markers

Then open .git/config and add
fetch = +refs/pull/*/head:refs/remotes/upstream/pr/* beneath your upstream repo config part.

So it should look something like

[remote "upstream"]
	url = https://github.com/lvoogdt/Leaflet.awesome-markers
	fetch = +refs/heads/*:refs/remotes/upstream/*
	fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*

Then do git fetch origin which should fetch my PR.
Then you can merge it with your local copy and push it to your fork.

@theashyster
Copy link

@bhaskarvk @george-silva What is the status on this? Are you going to put these changes in the new repo?

@george-silva
Copy link

@theashyster the new repo is already setup with releases to npm and bower. I haven't merged the PR from @bhaskarvk .

@bhaskarvk can you PR to that repo instead?

@theashyster
Copy link

@george-silva Maybe you can do the suggestion from this comment? #80 (comment)

@george-silva
Copy link

The PR is open at: sigma-geosistemas/Leaflet.awesome-markers#8

Please, help me with testing 😄

Thanks everyone.

@jgravois
Copy link

@bhaskarvk just fyi, you can 'turn on' issues in a fork via:

Settings > Features

  • Issues

@bhaskarvk
Copy link
Author

@jgravois That's for @george-silva to do on his repo. My fork is not the official successor, his is.

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.

8 participants