Closed dantti closed 8 years ago
Ping
Opening a new pull request causes confusion. Please re-open the previous one, and push these commits there. There shouldn't be any _2
branch.
Then, please make sure to clean up all of the commits. For example, one of your commits adds a led
method, the next commit comments it out, and a later commit removes it. Please provide a branch with clean history. See https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History for a start.
I tried to merge the two branches but there are conflicts as _2 did not include all commits from first attempt, I can try to clean up if _2, sorry I'm not very skilled at doing more than git commit/rebase/push :P
If the _2 branch is 'the right one', then do this:
git checkout complex_if
git reset --hard complex_if_2 # Make complex_if the same as complex_if_2
git branch -d complex_if_2 # Delete the complex_if_2 branch
git push -f
New branch with cleaned patches to add support for complex if (==, >, >=, <=, !=, in, not in)