search

nutshell-platform / app

The react-native (expo) codebase of the Nutshell platform, with CI pipeline to Firebase.
https://nutshell.social/
0 stars 0 forks source link

Various text updates for legibility. #40

Closed bramgrolleman closed 4 years ago

actuallymentor commented 4 years ago

Great work!

Did you change the package.json on purpose? It looks like you downgraded the firebase module?

Also this one can be simplified from:

export const version = `${ revisionId ? `- ${ revisionId }` : '' }`

to:

export const version = revisionId || 'development'

Where that oneliner means "version is revisionId but if that variable is empty use the string'development' instead.

bramgrolleman commented 4 years ago

@actuallymentor I haven't changed the package.json on purpose. It just does so every time I pull the updated code from the web. As far as I know, all my packages are up-to-date. Expo does give a weird warning every time that it's outdated even though I've just updated it before that.

I've simplified the code you've suggested and made a new commit. In addition, I've added some clarification to the final card that makes it clear that there are no more Nutshells to read.

actuallymentor commented 4 years ago

Hmm this can sometimes happen if the branch you are merging to has been updated since you made the branch.

Before merging (and making a PR) it's a good idea to rebase with the branch you merge into. This "catches you up" to the changes that happened since the merge.

To do so:

git checkout staging (since we are merging there)
git pull
git checkout yourbranch
git rebase staging

Could you try that and push the result? Should fix the history.

actuallymentor commented 4 years ago

Changed the dependencies to have no more errors and finished the rebase. I suspect you used git commit instead of git rebase --continue during the rebase.