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

Cve-2017-5929 #79

Closed
wants to merge 3 commits into from
Closed

Cve-2017-5929 #79

wants to merge 3 commits into from

Conversation

cplvic
Copy link
Contributor

@cplvic cplvic commented Mar 15, 2017

For issue #76
@ashcrow @jasinner

@cplvic
Copy link
Contributor Author

cplvic commented Mar 15, 2017

@ashcrow - I'm not comfortable with github. Does this pull request when merged actually delete the file that was created in PR #78 ?

@ashcrow
Copy link
Member

ashcrow commented Mar 15, 2017

This PR looks like it would delete the file. What are you trying to accomplish? I'm happy to help.

@ashcrow
Copy link
Member

ashcrow commented Mar 15, 2017

@cplvic I think you want follow this kind of process.

  1. git checkout master
  2. git checkout -b CVE-2017-5929
  3. make your modifications
  4. git commit ...
  5. git push origin CVE-2017-5929
  6. Submit PR

The important part here is starting with master. I have a feeling you started from #78's branch which means that commit came along (causing you to believe you needed to delete the file). If you generally follow the above then the both would merge without bothering each other.

@ashcrow ashcrow self-requested a review March 15, 2017 20:45
@cplvic
Copy link
Contributor Author

cplvic commented Mar 15, 2017

yes @ashcrow
let me redo this one ....

@cplvic cplvic closed this Mar 15, 2017
@cplvic cplvic deleted the CVE-2017-5929 branch March 15, 2017 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants