Skip to content

Conversation

@rparree
Copy link
Contributor

@rparree rparree commented Apr 29, 2021

No description provided.

Copy link
Member

@sjrd sjrd left a comment

Choose a reason for hiding this comment

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

Thank you.

Next time, you can just force-push to your existing branch, rather than opening a new PR. A new PR discards the comments and the context.

@sjrd sjrd merged commit 2b8d3b0 into scala-js:master Apr 29, 2021
@rparree
Copy link
Contributor Author

rparree commented Apr 29, 2021

I totally agree and understand. Hate it myself when devs do the same with PRs on my internal projects. I screwed up and merged when pushing. That left a DAG that i could no longer squash easily.

@rparree rparree deleted the package-json branch April 29, 2021 15:02
@sjrd
Copy link
Member

sjrd commented Apr 29, 2021

Ah, a soft reset is your best friend in those situations:

$ git reset origin/master 

and then re-commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants