Add Ukraininan language #414
Conversation
|
@hazzik Rebased commit should be on master or in add-ukrainian-language branch? |
| @@ -1,6 +1,7 @@ | |||
| ###In Development | |||
|
|
|||
| [Commits](https://github.com/MehdiK/Humanizer/compare/v1.35.0...master) | |||
| - [#399](https://github.com/MehdiK/Humanizer/pull/414): Add Ukraininan language | |||
There was a problem hiding this comment.
Please change the PR number in link text to 414 from 399?
|
So I was finally able to rebase and squash commits into one. What I don't understand is why is there an empty commit called 'Merge branch 'add-ukrainian-language' of...' I didn't create it and just appeared there after I synced commit after rebase. |
|
you need to force push |
|
Should I just run git push --force ? |
|
Yes, now everything "up to date", but it is complete mess. |
|
You may want to do following git remote add upstream https://github.com/MehdiK/Humanizer.git
git checkout add-ukrainian-language
git reset a6cfc0d -- hard
git rebase upstream/master -iin the dialog squash wanted commits, edit the commit message git push origin add-ukrainian-language:add-ukrainian-language -fOr like this: git remote add upstream https://github.com/MehdiK/Humanizer.git
git merge upstream/master
git reset upstream/masterCommit all files again. With appropriate commit message git push origin add-ukrainian-language:add-ukrainian-language -f |
|
You still merge with your master. Dont do this:) Try again. Before you begin again: |
dmytro-i
force-pushed
the
add-ukrainian-language
branch
from
f4fed70 to
a6cfc0d
Compare
|
My master and my branch are now restored to desired state. So now I squash my commits into one commit, correct? |
|
@dmytro-ielkin yes, please |
dmytro-i
force-pushed
the
add-ukrainian-language
branch
from
548793e to
3d10fda
Compare
|
Did I do it right this time? |
dmytro-i
force-pushed
the
add-ukrainian-language
branch
from
3d10fda to
a6cfc0d
Compare
dmytro-i
force-pushed
the
add-ukrainian-language
branch
2 times, most recently
from
810c21a to
e4409f1
Compare
| [InlineData(24, "через 24 секунди")] | ||
| [InlineData(25, "через 25 секунд")] | ||
| [InlineData(40, "через 40 секунд")] | ||
| public void SecondsFromNow(int seconds, string expected) |
There was a problem hiding this comment.
You have one complex language!! ;)
|
Thanks for the contribution. This is now available on nuget as v1.36.0. |
|
Awesome. Thank you too for the creating the project in the first place. |
Hi everyone,
Continued PR from #411
I was didn't create a branch from the very beginning and was working in my master and therefore could not really rebase and make things clean. So I removed and re-created the repository.
Please review and let me know if it's OK.