Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

C# -> VB: don't convert generic static to module, fix generic interface implements statement, concatenate inner namespaces with the parent #456

Merged
merged 3 commits into from
Dec 10, 2019

Conversation

Copy link
Member

@GrahamTheCoder GrahamTheCoder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks good. Could you try to rebase onto origin master so the nuget.exe change disappears from github? Something like

git fetch --all
git rebase origin/master
git push --force-with-lease

@Alexilia
Copy link
Contributor Author

I had to download and push these files manually :(

@GrahamTheCoder GrahamTheCoder merged commit 3fa5c25 into icsharpcode:master Dec 10, 2019
@GrahamTheCoder
Copy link
Member

GrahamTheCoder commented Dec 10, 2019

OK, I've done the rebase on the above branch and merged, thanks!

EDIT: Ignore the rest of this message if you see it now - just start all new branches from origin/master

To tidy things up for your current work in progress branch "work" could you make sure you've committed any local changes (or reset if you don't want them) then run:

git fetch --all
git checkout work
git rebase --onto origin/master origin/badbase work
git push --force-with-lease

In GitExtensions graph view, the change looks like this, before:
image

After:
image

Once done, if you always just start your branch from origin/master it will keep the list of changes in the PR nice and simple (like it now looks above since I did essentially the same to this PR).

Let me know if you're struggling with any bit of it or what tools you're using and I'll try to give more specific help.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants