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

Update support link #668

Merged
merged 3 commits into from
Mar 6, 2023
Merged

Update support link #668

merged 3 commits into from
Mar 6, 2023

Conversation

sempruijs
Copy link
Contributor

@sempruijs sempruijs commented Mar 2, 2023

Pull Request Checklist

@sempruijs
Copy link
Contributor Author

Signed-off-by: Sem Pruijs sem@pruijs.net

@sempruijs
Copy link
Contributor Author

sempruijs commented Mar 2, 2023

Can someone help me a hand? I created a fork of the repo, created a new branch and made changes on that branch. Then I pushed to that branch the my fork. Now when I open this pr I see commits from another pr that I did earlier, but GitHub only shows in the file changes the actual changes that I did.

In the pr there are 7 commits, but I actually only did 2 on this branch. How did this happen?

@pixlwave
Copy link
Member

pixlwave commented Mar 2, 2023

For every new change you make, you should create a new branch from develop. You can fix this PR by

  • Creating a new branch called say update-support-link-2 from develop
  • Cherry pick the commits from update-support-link you would like to keep for this PR.
  • Double check you did this correctly.
  • Delete the update-support-link branch
  • Rename update-support-link-2 to update-support-link
  • Force push the update-support-link branch.

Doing all of this with a git GUI client will be the easiest way to do so.

And then from that point onwards, remember to branch from develop before you start a new piece of work 😃

@codecov
Copy link

codecov bot commented Mar 2, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (eed031c) 51.68% compared to head (64e9b28) 51.68%.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop     #668   +/-   ##
========================================
  Coverage    51.68%   51.68%           
========================================
  Files          263      263           
  Lines        14310    14310           
  Branches      9133     9133           
========================================
  Hits          7396     7396           
  Misses        6691     6691           
  Partials       223      223           
Flag Coverage Δ
unittests 20.66% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@sempruijs
Copy link
Contributor Author

@pixlwave thank you for your help. Learned allot about git. It's good to go now

@sonarqubecloud
Copy link

sonarqubecloud bot commented Mar 3, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

Copy link
Member

@stefanceriu stefanceriu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm 👍

@stefanceriu stefanceriu merged commit 1fe2e7e into element-hq:develop Mar 6, 2023
@sempruijs sempruijs deleted the update-support-link branch March 6, 2023 21:03
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