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

doc: add info on syncing to origin/main and rebasing #1540

Merged
merged 2 commits into from
Jan 26, 2022

Conversation

terriko
Copy link
Contributor

@terriko terriko commented Jan 21, 2022

Adding some information for common problems first time contributors have:

  • keeping their main branch in sync with origin/main . Previously we said it was a good idea but didn't include info on what to do if you accidentally commit to that branch)
  • rebasing to origin/main. Just saying that it comes up sometimes in code review and giving a link to a more extensive document on what git rebase means.

@codecov-commenter
Copy link

Codecov Report

Merging #1540 (481c099) into main (b2262e0) will increase coverage by 0.09%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1540      +/-   ##
==========================================
+ Coverage   79.18%   79.27%   +0.09%     
==========================================
  Files         281      281              
  Lines        5548     5548              
  Branches      905      905              
==========================================
+ Hits         4393     4398       +5     
+ Misses        971      966       -5     
  Partials      184      184              
Flag Coverage Δ
longtests 79.27% <ø> (+0.09%) ⬆️

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

Impacted Files Coverage Δ
cve_bin_tool/nvd_api.py 87.75% <0.00%> (+5.10%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b2262e0...481c099. Read the comment docs.

@terriko
Copy link
Contributor Author

terriko commented Jan 26, 2022

I'm going to take @BreadGenie 's thumbs up above as sufficient documentation review and go ahead and merge this. Thanks!

@terriko terriko merged commit 9ada43f into intel:main Jan 26, 2022
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