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

What is in the Sample folder? #117

Closed
tpetricek opened this issue Sep 25, 2018 · 10 comments
Closed

What is in the Sample folder? #117

tpetricek opened this issue Sep 25, 2018 · 10 comments
Assignees

Comments

@tpetricek
Copy link
Member

I just downloaded fresh copy of FsReveal and I'm not sure what is the purpose of the Fable/Elmish project in the Sample project.

This seems to be from a commit by @forki (5d4833f), but there is no PR for it and also I do not see much about this in the docs.

Can someone explain what this does?

@forki
Copy link
Member

forki commented Sep 25, 2018 via email

@vbfox
Copy link
Collaborator

vbfox commented Oct 7, 2018

Seem like everything after 73cb488 shouldn't be there...

git reset --hard 73cb488a3b2beaf3e700d5d4537dc9ba16396203
git cherry-pick cd6407373295c2c5711e501496e9de61062296ac
git push -f

@forki
Copy link
Member

forki commented Oct 27, 2018

sorry took me a while. but done.

@forki forki closed this as completed Oct 27, 2018
@vbfox
Copy link
Collaborator

vbfox commented Oct 27, 2018

👍 you might want to cherry-pick the paket bootstrapper update too :)

@forki
Copy link
Member

forki commented Oct 27, 2018

I think I did

@vbfox
Copy link
Collaborator

vbfox commented Oct 29, 2018

@forki I think there still is a problem with the master branch, the commits changed but the ones with the presentation are still there, It seem that only the bootstrapper commit is missing from the previous state

@forki
Copy link
Member

forki commented Oct 29, 2018 via email

@vbfox
Copy link
Collaborator

vbfox commented Oct 29, 2018

Weird, I might have serious git understanding problems

The previous state was (Taken from a fork that still has it) :

image

New state :

image

With the commands it should have resulted in 73cb488a3b2beaf3e700d5d4537dc9ba16396203 being the second to last commit and a new commit derived from cd6407373295c2c5711e501496e9de61062296ac the last one :

From my fork (where I ran the 3 commands and continued to commit after) :

image

So I don't know what happened here, normally re-running the commands (on a PC that has seen cd6407373295c2c5711e501496e9de61062296ac) should give the correct state.

If needed I can also do the change (given temporary commit access) or do a reverting-PR (It will keep the current history so it's a little more messy but I can do it via PR)

@forki
Copy link
Member

forki commented Oct 29, 2018 via email

@vbfox
Copy link
Collaborator

vbfox commented Oct 29, 2018

Done

image

@vbfox vbfox self-assigned this Oct 29, 2018
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

No branches or pull requests

3 participants