Skip to content

Conversation

@fourofspades
Copy link

Call shell script.

@phhusson
Copy link
Owner

phhusson commented May 8, 2020

The code is fine, but please rebase into just one commit, and make a proper commit message saying this is to remove telephony

@fourofspades fourofspades force-pushed the Issue_#1141_TabletMode branch from 0c667ae to 218f165 Compare May 8, 2020 18:36
@fourofspades
Copy link
Author

Do I need to do any more work on this pull request?

@phhusson
Copy link
Owner

Could you rebase?

@fourofspades
Copy link
Author

OK, rebased.

@fourofspades
Copy link
Author

Think I have done this correctly, don't really use GIT and rebasing much in my usual GIT usage.

@phhusson
Copy link
Owner

Not really, there is supposed to be no "Merge " commits

Assuming my remote is origin, and yours is me do this:

git pull --rebase origin master
git push -f me Issue_#1141_TabletMode

@fourofspades fourofspades force-pushed the Issue_#1141_TabletMode branch from f9dc4e5 to 218f165 Compare May 24, 2020 16:00
@fourofspades fourofspades force-pushed the Issue_#1141_TabletMode branch from 218f165 to ae44b04 Compare May 24, 2020 16:01
@phhusson
Copy link
Owner

that's still not ok, but I'll merge manually, thanks

AndyCGYan pushed a commit to AndyCGYan/treble_app that referenced this pull request Jan 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants