#1676 nuget packages

[MrTortoise]

This is just the nuget portion of this issue. Got a nod from Aaron regarding this pull request.

I am working on the rest as well. Bit busy next couple of days and its larger than i expected but itl come.

My first pull request from a feature branch in git like this so if i fubar please explain and ill sort it asap ;)
I think i followed the instructions though!

[Aaronontheweb]

@MrTortoise could you rebase?

[MrTortoise]

in theory yes.

What do you want me to rebase onto what?
What I have tried to do so far is:
add upstream and merge dev into my origin/dev
I was then expecting to be able to rebase my branch onto that merge ...

Is that correct?
(because when i do the rebase i end up 1 set behind and several ahead so
cannot pull or push)

On 9 February 2016 at 20:25, Aaron Stannard notifications@github.com
wrote:

@MrTortoise https://github.com/MrTortoise could you rebase?

—
Reply to this email directly or view it on GitHub
#1693 (comment).

[Aaronontheweb]

https://youtu.be/8UguQzmswC4?t=4m55s - shows how to do it

git rebase -i dev

Need to consolidate these two commits into 1.

[MrTortoise]

well i think that has gone wrong.

[Horusiath]

If it passes tests, looks good for me.

[MrTortoise]

I haven't rebased this successfully due to my ineptness with git.
I think i have got it into a state now where i cannot do so cleanly.

[Danthar]

MrTortoise if you follow the instructions in the youtube link @Aaronontheweb posted. It should work.
So git fetch upstream
make sure your in your branch
then git rebase -i upstream/dev and squash your commits.
Now it should have replayed your commits on top of the head of upstream/dev
then git push -f origin

[MrTortoise]

as i said above, i have got my fork into a state that i do not know how to recover from

https://github.com/MrTortoise/akka.net

if you want to take a look. I have watched aarons video many times and it doesn't cover the situation i am in.

[Danthar]

closing this, since the rebase from Aaron was merged.