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

Rebase (2) #135

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

Rebase (2) #135

wants to merge 2 commits into from

Conversation

aezv
Copy link
Contributor

@aezv aezv commented Oct 13, 2020

No description provided.

@@ -545,6 +545,9 @@ var testDictionary = [
["напорядок больше","на порядок больше"],
["по-тихоньку пишу","потихоньку пишу"],
["0.9 милиграмма","0.9 миллиграмма"],
["регуллируемая поддержка спины","регулируемая поддержка спины"],
Copy link
Owner

Choose a reason for hiding this comment

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

В исходном коммите так и было - в тесты шли сразу словосочетания? А ребейз остального на эту ветку нормально проходит?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

В тестах было слово
image
Ребейз прошел нормально, несколько конфликтов которые легко решились

Copy link
Owner

Choose a reason for hiding this comment

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

В таких случаях мы разве не оставляем слово, просто добавляя словосочетание?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Кажется, да. На автомате просто заменять начал

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.

3 participants