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

Updated comment.rb #10999

Closed
wants to merge 1 commit into from
Closed

Updated comment.rb #10999

wants to merge 1 commit into from

Conversation

rajvidg
Copy link
Contributor

@rajvidg rajvidg commented Apr 8, 2022

No description provided.

@rajvidg rajvidg requested a review from a team as a code owner April 8, 2022 19:51
@gitpod-io
Copy link

gitpod-io bot commented Apr 8, 2022

@codeclimate
Copy link

codeclimate bot commented Apr 8, 2022

Code Climate has analyzed commit dfc4572 and detected 0 issues on this pull request.

View more on Code Climate.

@github-actions
Copy link

github-actions bot commented Apr 8, 2022

This pull request generated screenshots of many common pages in the running app. You should be able to download and view them here:
https://github.com/publiclab/plots2/suites/5992756294/artifacts/206672917

@TildaDares
Copy link
Member

@rajvidg The changes in this PR and #11000 should be in the same PR.

@rajvidg rajvidg changed the title Made changes in the 1st file to be changed Updated comment.rb Apr 9, 2022
@rajvidg
Copy link
Contributor Author

rajvidg commented Apr 9, 2022

@rajvidg The changes in this PR and #11000 should be in the same PR.

@TildaDares since I am new to this can you please tell me how can we put those changes in the same pr, or please give me some time I am working on it.

@rajvidg
Copy link
Contributor Author

rajvidg commented Apr 9, 2022

@rajvidg The changes in this PR and #11000 should be in the same PR.

@TildaDares should I close both of my earlier prs and then raise a new one, and also I have created a pr in my forked repo.

@TildaDares
Copy link
Member

@rajvidg What you need to do is run git checkout patch-1 to start using patch-1 branch and then run git merge patch-2 to merge the changes in patch-2 together with the changes in patch-1. After doing that you can do a push.

@rajvidg
Copy link
Contributor Author

rajvidg commented Apr 9, 2022

@rajvidg What you need to do is run git checkout patch-1 to start using patch-1 branch and then run git merge patch-2 to merge the changes in patch-2 together with the changes in patch-1. After doing that you can do a push.

@TildaDares Okay thank you, working on it.

@rajvidg
Copy link
Contributor Author

rajvidg commented Apr 9, 2022

@rajvidg What you need to do is run git checkout patch-1 to start using patch-1 branch and then run git merge patch-2 to merge the changes in patch-2 together with the changes in patch-1. After doing that you can do a push.

@TildaDares I am working on it but I think I made the changes and commit them before creating a branch in my local, so can you please suggest some tutorial or just please spare me some time, I shall be really very grateful for that, I am really trying to solve this and make them in the same pr.

@TildaDares
Copy link
Member

Hi @rajvidg, you can just close these PRs and make a new one in a new PR.

@rajvidg
Copy link
Contributor Author

rajvidg commented Apr 11, 2022

Hi @rajvidg, you can just close these PRs and make a new one in a new PR.

ok thank you @TildaDares , working on it.

@rajvidg rajvidg closed this Apr 11, 2022
@rajvidg
Copy link
Contributor Author

rajvidg commented Apr 11, 2022

plots2_Problem1

plots2_Problem2

@TildaDares I am still facing these problems, :(

@TildaDares
Copy link
Member

@rajvidg You can follow this guide @Somya-Singhal put together publiclab/infragram#300. Skip the steps you’ve done.

@rajvidg
Copy link
Contributor Author

rajvidg commented Apr 12, 2022

@rajvidg You can follow this guide @Somya-Singhal put together publiclab/infragram#300. Skip the steps you’ve done.

ok thank you again, working on it @TildaDares

@rajvidg
Copy link
Contributor Author

rajvidg commented Apr 13, 2022

@rajvidg You can follow this guide @Somya-Singhal put together publiclab/infragram#300. Skip the steps you’ve done.

@TildaDares since I had already made those changes in my forked repo, after cloning the changes were already there in my local also, so will there be any effect after git diff or commit or push?

Also, I have made a single pull request from my forked repo, in GitHub itself, so please have a look at it.

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.

2 participants