Skip to content

Conversation

0crap
Copy link
Contributor

@0crap 0crap commented Jan 3, 2019

My first pull request, so bear with me. :-)

Tested on my Taranis X7 and looks fine.

PageFiles =
PageFiles =
{
"vtx.lua",
Copy link
Member

Choose a reason for hiding this comment

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

This ordering change is entirely subjective, and will probably be disliked by just as many users as it will be liked by, plus it will be disliked by all users that do not like a change from what they are used to, so I don't think this should be done without a good reason.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OMG did I do this?
I only wanted to change these on my own github 0crap account and not at all push into the official master. Only do the minor textual improvement back into the master. Can you tell me what I did wrong?

"filters2.lua",
"pwm.lua",
"vtx.lua",
"rescue.lua",
Copy link
Member

Choose a reason for hiding this comment

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

These should not be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OMG did I do this?
I only wanted to change these on my own github 0crap account and not at all push into the official master. Only do the minor textual improvement back into the master. Can you tell me what I did wrong?

@0crap
Copy link
Contributor Author

0crap commented Jan 8, 2019

I'm closing this pull request, I have no idea what went wrong.
Going to try again, sorry for the trouble.

@0crap 0crap closed this Jan 8, 2019
@mikeller
Copy link
Member

mikeller commented Jan 8, 2019

@0crap: Don't close this (you can always reopen it). Git is quite good in terms of the tools available to to fix a branch (and any associated pull request).

https://github.com/betaflight/betaflight-tx-lua-scripts/pull/194/commits

Looks like you've accidentally pushed commit 'Changed order and removed GPS stuff.' into the pull request branch. git rebase -i master, then follow the instructions to drop the offending commit, then git push --force-with-lease should get you out of there.

@0crap
Copy link
Contributor Author

0crap commented Jan 8, 2019

@mikeller Thx for your advice!

I'm still struggling to grab the GitHub concept. (For now with GitHub Desktop and less with CLI commands.)
I will replay this with a Github test account to see how above works.
I don't feel comfortable enough for now against the official BF master, so I already created a new PR.
That was my easy way out for this one. :-)

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

Labels

None yet

2 participants