Skip to content
This repository was archived by the owner on Aug 13, 2026. It is now read-only.

feat: added new social and support options - #83

Merged
rishavanand merged 14 commits into
rishavanand:devfrom
SagarYadav17:master
Jul 10, 2022
Merged

feat: added new social and support options#83
rishavanand merged 14 commits into
rishavanand:devfrom
SagarYadav17:master

Conversation

@SagarYadav17

Copy link
Copy Markdown
  • Added GitLab and Hashnode into the social section
  • Added Liberapay & Ko-fi into the support section

@rishavanand

Copy link
Copy Markdown
Owner

Hi @SagarYadav17
Could you rebase your branch with the Dev branch?

@SagarYadav17

Copy link
Copy Markdown
Author

@rishavanand Well, I tried rebasing and I hope I did exactly what you need.

@rishavanand

rishavanand commented Oct 21, 2021

Copy link
Copy Markdown
Owner

It seems the rebase is not correct. Please rebase with the dev branch. There should only be one commit.

@SagarYadav17

Copy link
Copy Markdown
Author

@rishavanand I need some help with rebasing this

  1. git checkout origin pr-83
  2. git rebase origin dev
  3. git pull
  4. git push

is that the correct order I need to perform?

@rishavanand

rishavanand commented Oct 28, 2021

Copy link
Copy Markdown
Owner

@SagarYadav17 it should be:

  1. git checkout your-branch-name
  2. git fetch origin dev
  3. git rebase origin/dev
  4. git push origin your-branch-name --force

@SagarYadav17

SagarYadav17 commented Oct 28, 2021

Copy link
Copy Markdown
Author

@rishavanand thanks, I did exactly as guided and I hope that work as you wanted.

@rishavanand
rishavanand merged commit df381fc into rishavanand:devJul 10, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@SagarYadav17@rishavanand@shreyavi