search

aricneto / TwistyTimer

Twisty Timer is a material design twisty puzzle timer for Android. It uses the TNoodle library to generate scramble sequences for all current official speedsolving puzzles.
GNU General Public License v3.0
241 stars 53 forks source link

Ab algorithms fix #49

Closed Combinacijus closed 7 years ago

Combinacijus commented 8 years ago

(BUG FIX) Aa and Ab algorithms are same.

Combinacijus commented 8 years ago

I'm confused with with pull requests and branching... I would like to merge all in one but can't find anything.

damo commented 8 years ago

@Combinacijusx You can create a new branch, say, "X"; check out "X"; merge the other branches into "X"; and then create a pull request for "X". That should roll all things together into one pull request. You can Google "git merge squash", if you want to see how to combine multiple commits together when they are merged to another branch.

Just a suggestion on the translations in "strings.xml": if a string is marked with 'translatable="false"', it should not be copied to the translated file. Only the non-translatable string in the original "values/strings.xml" should exist.