search

huiyie / hacktober-learn-react

Hacktoberfest 2017 is an opportunity for us to learn React together!
2 stars 8 forks source link

Add feature routing #14

Closed beatfreaker closed 7 years ago

beatfreaker commented 7 years ago

added routing feature

beatfreaker commented 7 years ago

Added references in README.md like this we can list the resources which we referred while developing this app.

huiyie commented 7 years ago

@TheCodeArtist What is the best way to resolve the conflicts with this PR? Should I rebase based on @beatfreaker 's commits?

TheCodeArtist commented 7 years ago

Hmmm... I see that PR #13 has been merged into master. So, there are a few conflicts in this PR #14 now.

Fortunately there is no logical conflict.

PR#13

PR#14

Usually the author of the commits is in the best position to update/rebase the PR to match the codebase. @beatfreaker Do you want to try updating the commtis in this PR to latest huiyie/hacktober-learn-react:master ?

If not then, either @huiyie or i can git fetch origin pull/14/head:master and work on rebasing the changes in local tree and the push updated PR / another PR (depending on whether github permits us to).

beatfreaker commented 7 years ago

@huiyie you can manually resolve conflicts

<<<<<<< feature-routing
        <Main />
=======
        <p className="App-intro">
          To get started, open <code>CONTRIBUTING.md</code>.
        </p>
>>>>>>> master

replace above with below code

        <Main />
beatfreaker commented 7 years ago

@huiyie @TheCodeArtist update the PR, please review it.