Closed SinithH closed 3 years ago
@SinithH Please resolve the conflicts and I'll merge asap.
@SinithH Please resolve the conflicts and I'll merge asap.
I have no idea how to. I am new to git
@SinithH No problem at all. The easiest way is just create a new branch from master, and do the changes manually again. then force push them to this branch. If you get lost you can also just create a new PR, and Ill approve it. Something just got messed in your branch, so git doesn't like it
@SinithH No problem at all. The easiest way is just create a new branch from master, and do the changes manually again. then force push them to this branch. If you get lost you can also just create a new PR, and Ill approve it. Something just got messed in your branch, so git doesn't like it
I opened a new PR. I hope it will be valid for hackotberfest since I actually opened it before 31st of October though there were some conflicts. new PR - https://github.com/aquasecurity/kube-hunter/pull/403
Description
Please include a summary of the change and which issue is fixed. Also include relevant motivation and context. List any dependencies that are required for this change.
Contribution Guidelines
Please Read through the Contribution Guidelines.
Fixed Issues
Please mention any issues fixed in the PR by referencing it properly in the commit message. As per the convention, use appropriate keywords such as
fixes
,closes
,resolves
to automatically refer the issue. Please consult official github documentation for details.Fixes #(issue)
"BEFORE" and "AFTER" output
To verify that the change works as desired, please include an output of terminal before and after the changes under headings "BEFORE" and "AFTER".
BEFORE
Any Terminal Output Before Changes.
AFTER
Any Terminal Output Before Changes.
Contribution checklist
Notes
Please mention if you have not checked any of the above boxes.