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

Many new features #36

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Many new features #36

wants to merge 40 commits into from

Conversation

meetinger
Copy link

@meetinger meetinger commented Jun 12, 2020

  1. Delay Override
  2. Bars Stroke
  3. Marks Settings
  4. FPS Settings
  5. Text antialiasing

@MusicTheorist
Copy link
Owner

Thank you so much!! I'll be looking over this for the next few weeks and manually merge your changes. Lemme know if you have any questions. Cheers!

@MusicTheorist MusicTheorist added enhancement New feature or request fixed Reported bug was fixed needstime Issue will be fixed in the future labels Jun 12, 2020
@meetinger meetinger force-pushed the master branch 2 times, most recently from 9c2cf16 to d1f7d63 Compare June 12, 2020 13:09
@landfillbaby
Copy link

landfillbaby commented Jun 12, 2020

ok so, sorry my advice before wasn't clear enough.
to actually fix this, run the following, which will delete any untracked or uncommited files!

git remote add upstream https://github.com/MusicTheorist/ArrayVisualizer.git
git fetch --all
git reset --hard HEAD~
git rebase d110ce8dbccd5ca824720748e41afcd925fb53a0
git push --force-with-lease

@landfillbaby
Copy link

sorry to be rude but how do you keep consistently breaking the commit history like this?
there's something very wrong with your git config

@landfillbaby
Copy link

landfillbaby commented Jul 20, 2020

now that i have write access i fixed it for you
rebased against d110ce8 just like before

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request fixed Reported bug was fixed needstime Issue will be fixed in the future
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants