Beginning changes to RC6

[timwright35]

Modified the code to work in RC6, there are two TS errors about Provider though so gulp test fails. I have run the code in my project though and it loads and runs fine, so I have slightly lost on that.

[GitCop]

There were the following issues with your Pull Request

• Commit: 80a7a40
  • Commits must be in the following format: %{type}(%{scope}): %{description}

Contribution guidelines are available at https://github.com/SebastianM/angular2-google-maps/blob/master/CONTRIBUTING.md

---

This message was auto-generated by https://gitcop.com

[GitCop]

There were the following issues with your Pull Request

• Commit: 80a7a40
  • Commits must be in the following format: %{type}(%{scope}): %{description}

Contribution guidelines are available at https://github.com/SebastianM/angular2-google-maps/blob/master/CONTRIBUTING.md

---

This message was auto-generated by https://gitcop.com

[timwright35]

Apparently I do not know how to format my commit name

[sebholstein]

@Tempus35 sorry, I didn't see that you are working on RC6 (and pushed some features in the meantime).

Can you rebase your commit (and fix the conflict)? A good commit message would be:

feat(*): support angular RC6

Let me know if you don't have time to complete this today. I want to release a version with RC6 support as soon as possible.
Thanks!

[sebholstein]

this file is a dup. please remove it. thanks

[GitCop]

There were the following issues with your Pull Request

• Commit: 80a7a40
  • Commits must be in the following format: %{type}(%{scope}): %{description}

Contribution guidelines are available at https://github.com/SebastianM/angular2-google-maps/blob/master/CONTRIBUTING.md

---

This message was auto-generated by https://gitcop.com

[GitCop]

There were the following issues with your Pull Request

• Commit: 80a7a40
  • Commits must be in the following format: %{type}(%{scope}): %{description}

Contribution guidelines are available at https://github.com/SebastianM/angular2-google-maps/blob/master/CONTRIBUTING.md

---

This message was auto-generated by https://gitcop.com

[timwright35]

Ok I apparently do not know how to rebase, any help. I made the changes above you gave though

[sebholstein]

Ok, I'll try to help you. First, we need to make sure that there are no conflicts any more.

Try to run this:

git pull upstream --rebase
git merge upstream/master

Then, you have to fix the conflicts and commit the changes (and push it to your origin).

When everything is fine, we can work on the rebase (to squash it to one commit). Hope this helps

[timwright35]

So no clue what I did but the first command is not working at all, one it says rebase is not an option and even without rebase it still does not work.

[sebholstein]

Oh, my bad. Try to run just git pull --rebase (and fix the conflicts)

[timwright35]

From https://github.com/Tempus35/angular2-google-maps

• branch master -> FETCH_HEAD
  Current branch master is up to date.

Gave me the above

[sebholstein]

Ok, sorry Tim, this is really hard to debug from here. Maybe it's easier when you send a new PR (because the merge conflicts will be hard to fix).

[timwright35]

Yea I was thinking the same things, I will close this one and send a new one with the right stuff from the beginning.