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

hot-fix #7

Merged
merged 5 commits into from
May 10, 2020
Merged

hot-fix #7

merged 5 commits into from
May 10, 2020

Conversation

torsami77
Copy link
Collaborator

Description

Quick fix to delete app.js.

orimdominic
orimdominic previously approved these changes May 9, 2020
orimdominic
orimdominic previously approved these changes May 9, 2020
Copy link

@orimdominic orimdominic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pulled this to my local.
I can find neither App.js nor app.js under src under the PR branch

I think this is what you should do

  1. Make a copy of the contents of the desired file (file to be retained) somewhere else
  2. Delete both files App.js and app.js
  3. Make a commit
  4. Create the desired file again with its contents in its former directory, the way it was previously
  5. Make a commit
  6. Push and make a PR

@orimdominic orimdominic dismissed their stale review May 9, 2020 16:04

Did not check before approving

@torsami77
Copy link
Collaborator Author

torsami77 commented May 9, 2020

@sudo-kaizen https://github.com/BuildForSDG/team-010-frontend/tree/hot-fix/src please could you confirm that you can see the appropriate files on the remote version? I think you should clone the repo afresh

@orimdominic
Copy link

@sudo-kaizen https://github.com/BuildForSDG/team-010-frontend/tree/hot-fix/src please could you confirm that you can see the appropriate files on the remote version? I think you should clone the repo afresh

missingfiles
Please find attached a screenshot of the ls src/ command for the PR commit. I cant find both App.js and app.js

@torsami77
Copy link
Collaborator Author

@sudo-kaizen , could you check now, I have followed procedure

Copy link

@orimdominic orimdominic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@torsami77 correct, but there is no App.js in the src folder. There's no App.js in the hot-fix remote PR branch too

Copy link

@orimdominic orimdominic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit works on my local

@Biosmatrix Biosmatrix linked an issue May 10, 2020 that may be closed by this pull request
@Biosmatrix Biosmatrix added this to the Sprint-2 milestone May 10, 2020
@Biosmatrix Biosmatrix added bug Something isn't working Front-End Front-End Development labels May 10, 2020
Copy link
Collaborator

@RuthChisom RuthChisom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please proceed

@RuthChisom RuthChisom merged commit 1a4bc22 into develop May 10, 2020
@orimdominic orimdominic mentioned this pull request May 16, 2020
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working Front-End Front-End Development
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CHORE] Project Scaffolding
4 participants