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

Fixed up Doc Comments #35

Closed
wants to merge 4 commits into from
Closed

Fixed up Doc Comments #35

wants to merge 4 commits into from

Conversation

rikrak
Copy link
Contributor

@rikrak rikrak commented Feb 20, 2018

I noticed there were a few build warnings around the Doc Comments in the code, so I've updated and added so that there's now less noise in the build output.

Hopefully I've not mucked up the Git branching\fetching\merging with this one :-)

@kevinkuszyk
Copy link
Member

Thanks @rikrak, I manually rebased and merged this one on my machine and it looks like GitHub didn't pickup the change as the commit hashes have changed. I'm going to close this PR, but don't worry your changes are in!

I think what's happened here, is that first commit to your master branch is resulting in merge commits when you are syncing up with the master here. Usually git would do a fast forward merge, but it can't in this case.

When you get a moment, it might be worth either creating a new master branch in your fork from the master here, or deleting your fork and starting over. Don't worry about losing your work for #34 as I have a copy of your commits in this repro in the rikrak/fa5-upgrade-rebased branch which you can pull into your fork if you need to make any changes.

I hope that makes sense, and thanks again for the contribution.

@rikrak
Copy link
Contributor Author

rikrak commented Feb 21, 2018

Thanks. I shall delete and re-create the fork as that is much easier for me. :-)

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.

2 participants