issue-83 Add scroll to comments button #115

2020-11-18T21:31:41+01:00

Irev-Dev commented

2020-11-18 21:31:41 +01:00

(Migrated from github.com)

Hey @Yash-R,

I was having a closer look at the unrelated changes in your PRs #114 and #112, and I noticed that the changes to the yarn lock and the submodels were mixed into different commits, hard to fix easily so I did some surgery, I'll explain the process so you can follow along, but I think the problem likely came from you staging all of the changes without reviewing them before you made a commit. Are you using the git command line or some kind of git GUI helper?
If you're using vscode it has some pretty handy visualisations to see what's staged and what isn't, but in general you should only stage and commit changes relevant to the work you're doing. If you see that changes to the submodule that's a bit of a special case and running git submodule update --recursive --remote should fix it most of the time, basically bring the commit of the remote inline with your local instance for the submodules (btw handly link to submodules in case you're not sure what they are ).

Here's how I removed the unrelated changes from your PR

checked out your branch
made my own branch git checkout -b kurt/issue-83 (mostly done for safety reasons so I didn't have to force push on your branch)
reset your last three commits from your PR while keeping the changes open git reset --soft HEAD~3
Only staged the related changes (I used the vscode gui for this)
commit and push

One downside of what I've done is it completely nukes the git history, so now these changes are counted as my commit, If you would like you can follow the above steps yourself or we can merge this PR. Up to you?
I'm going to decline your other PRs now.
Sorry for the fuss, I hope the above helps.

resolves #83

Hey @Yash-R, I was having a closer look at the unrelated changes in your PRs #114 and #112, and I noticed that the changes to the yarn lock and the submodels were mixed into different commits, hard to fix easily so I did some surgery, I'll explain the process so you can follow along, but I think the problem likely came from you staging all of the changes without reviewing them before you made a commit. Are you using the git command line or some kind of git GUI helper? If you're using vscode it has some pretty handy visualisations to see what's staged and what isn't, but in general you should only stage and commit changes relevant to the work you're doing. If you see that changes to the submodule that's a bit of a special case and running `git submodule update --recursive --remote` should fix it most of the time, basically bring the commit of the remote inline with your local instance for the submodules (btw [handly link to submodules](https://gist.github.com/gitaarik/8735255) in case you're not sure what they are ). Here's how I removed the unrelated changes from your PR 1) checked out your branch 2) made my own branch `git checkout -b kurt/issue-83` (mostly done for safety reasons so I didn't have to force push on your branch) 3) reset your last three commits from your PR while keeping the changes open `git reset --soft HEAD~3` 4) Only staged the related changes (I used the vscode gui for this) ![image](https://user-images.githubusercontent.com/29681384/99584011-830af280-2a38-11eb-9e71-cb005655d7ef.png) 5) commit and push One downside of what I've done is it completely nukes the git history, so now these changes are counted as my commit, If you would like you can follow the above steps yourself or we can merge this PR. Up to you? I'm going to decline your other PRs now. Sorry for the fuss, I hope the above helps. resolves #83

Yash-R (Migrated from github.com) approved these changes 2020-11-19 06:05:47 +01:00

Yash-R (Migrated from github.com) left a comment

okay you can merge this PR

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: h3n3/cadhub#115