atom-archive / xray

An experimental next-generation Electron-based text editor
MIT License
8.48k stars 235 forks source link

Clip points when adding selections in buffer_view #131

Closed ckissane closed 5 years ago

ckissane commented 5 years ago
lee-dohm commented 5 years ago

Thanks for the contribution.

Before we take a further look at this, we'll need you to remove the commits having to do with the nifty icon from the history. For legal reasons, we can't accept a commit like that, even one that is later reverted. You can use the git rebase --interactive command to rewrite the history to completely remove 38cf75a and 8e5a196, then use git push --force to push the rewritten history up to your fork.

Arcanemagus commented 5 years ago

If you want to save those commits somewhere before cleaning things up you should create a branch to save it with git branch mylogo 38cf75a.

You can remove those two commits using git rebase -i HEAD~4 to interactively rebase the last 4 commits, from the editor that comes up you can change pick to d or drop to remove those commits. Once the rebase finishes and everything looks correct you will need to force push the branch back up with git push --force.

For future PRs it's always a good idea to work on a separate branch so you don't run into issues like this later.