saloni-15 / Heel2Toe

A beginner-friendly repository to get started with HTML, CSS, and JS.

https://saloni-15.github.io/Heel2Toe/

MIT License

22 stars 97 forks source link

Scroll Indicator is implemented #147

Closed yogesh2k21 closed 2 years ago

yogesh2k21 commented 2 years ago

📝 Description

I added a scroll indicator at the top in nav bar

🔧 A new Feature to this awesome site

📷 Provide related Screenshot/Gifs if any.

Uploading 2021-10-14 15-59-13.mp4…

[x] I have performed a self-review of my own code.
[x] I'm a contributor in Hacktoberfest'21.

yogesh2k21 commented 2 years ago

@saloni-15 have a look

saloni-15 commented 2 years ago

hey @yogesh2k21, your gif is not uploaded successfully also please resolve the conflicts.

yogesh2k21 commented 2 years ago

@saloni-15

https://user-images.githubusercontent.com/52989607/137435430-57cffb6a-a19e-47c7-9d3b-a9d5258e1322.mp4

can u plz help me out in solving conflicts Errors:-

$ git push -u origin yogesh2k21 To https://github.com/yogesh2k21/Heel2Toe.git ! [rejected] yogesh2k21 -> yogesh2k21 (non-fast-forward) error: failed to push some refs to 'https://github.com/yogesh2k21/Heel2Toe.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

saloni-15 commented 2 years ago

hey @yogesh2k21, your repository is 195 commits behind the main repository so you have to update it first.

Firstly remove your changes
On your repository you can see an option for fetch upstream in place of Contribute, you can click there, and then on your git bash you can do a git pull to update your local repository.
Again add your changes and make a commit.

yogesh2k21 commented 2 years ago

Oh ok , thanks for explaining 🙂

yogesh2k21 commented 2 years ago

@saloni-15 have a look on #160