Skip to content

Added full stop#1288

Closed
chaytanyasinha wants to merge 1 commit into
treeverse:masterfrom
chaytanyasinha:add-full-stop
Closed

Added full stop#1288
chaytanyasinha wants to merge 1 commit into
treeverse:masterfrom
chaytanyasinha:add-full-stop

Conversation

@chaytanyasinha
Copy link
Copy Markdown

Added full stop in the end of a sentence in privacy.md

@shcheklein
Copy link
Copy Markdown
Contributor

@chaytanyasinha please rebase to fix the CI check

@chaytanyasinha
Copy link
Copy Markdown
Author

@shcheklein I think I ran prettier.Can you please tell the command and when to use so that I can cross check.

@jorgeorpinel
Copy link
Copy Markdown
Contributor

jorgeorpinel commented May 13, 2020

I think you can just fetch upstream, pull master, and merge into or rebase your branch, @chaytanyasinha. Or just apply the change again from the latest master and open the PR again.

I'm not really sure why the CI check is failing on a file that's not part of this PR @shcheklein was something committed to master directly without formatting by accident? Strange

@chaytanyasinha
Copy link
Copy Markdown
Author

@shcheklein @jorgeorpinel can you please tell the prettier command to be used in git bash. I think it's doing some problem from there.

@jorgeorpinel
Copy link
Copy Markdown
Contributor

@chaytanyasinha all the commands used by CI and others are explained here: https://dvc.org/doc/user-guide/contributing/docs#all-commands

Your dev environment runs the formatting automatically. The problem here is with a file that you didn't change, not something you caused. It sounds like this has since been fixed in the master branch which is why Ivan suggested you rebase yours. Merging, cherry-picking, or just doing your small change again from the latest master and submitting the PR again should also work.

https://www.atlassian.com/git/tutorials/merging-vs-rebasing

@chaytanyasinha
Copy link
Copy Markdown
Author

chaytanyasinha commented May 14, 2020

@jorgeorpinel okay I got it. Thanks for the help.

jorgeorpinel added a commit that referenced this pull request May 19, 2020
@jorgeorpinel
Copy link
Copy Markdown
Contributor

Hey @chaytanyasinha I just applied this myself to my latest branch and tagged you in 67f0648. Thanks

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

Successfully merging this pull request may close these issues.

3 participants