search

ethereum / fe

Emerging smart contract language for the Ethereum blockchain.
https://fe-lang.org
Other
1.6k stars 179 forks source link

[Website/docs]: Adds "Using Fe" section #928

Closed jmcook1186 closed 1 year ago

jmcook1186 commented 1 year ago

Adds "Using Fe" section to the docs. This is where we can collect end-user info such as the installation guide, info about using projects, etc. This is also where we can have a sub-directory for example app walkthrough guides.

Moved the installation and projects pages out of quickstart and into the new Using Fe section.

cburgdorf commented 1 year ago

Github says I can't merge it because it needs to have conflicts resolved.

jmcook1186 commented 1 year ago

conflicts should be resolved now..?

cburgdorf commented 1 year ago

conflicts should be resolved now..?

image

It isn't. You should fetch latest master and then rebase on top of latest master, resolving conflicts as they appear. Let me know if you run into trouble with that, I can also handle the conflict resolution on my side prior to merging.

cburgdorf commented 1 year ago

Hey @jmcook1186 the PR still had conflicts and hence Github would not let me merge it. Here is what I did to resolve it.

  1. I checked out your PR locally and rebased it on top of latest master. This process will take each of your commits and perform it on top of latest master stopping at commits that produce conflicts

image

git status will tell me which files have conflicts that need to be resolved.

image

My edit tells me what the conflict is and lets me resolve it.

image

Once all conflicts are resolved you stage the changes via git add . (not in the screenshot) and run git rebase --continue

image

This process might repeat if there continue to be conflicts in the commits that follow to be applied on top.

I did all that, pushed it into your PR and now it can be merged. Hope that helps!