[it] Improvement of translation of the second chapter #235
Conversation
… (tenendo conto della terminologia delle pile push/pop <-> inserire/togliere).
|
You included a commit which modifies the original english text. Can you split your PR into one on full italian and one on english ? |
|
How can I do that? |
|
You can rebase -i your master on remote/master and just delete the line of commit da43fe7 so that it no longer appears. Then push -f your master to github. |
|
Ok! I did what you suggested, but the problem now is: "Everything up-to-date". In the log list the da43fe7 doesn't exist anymore. What is the problem? |
|
Do you mean that you can not push your new master to github. This is strange if you changed it. Git should at least warn that you are trying to push to a remote ref which was already published. Moreover, I am suspicious in your changes (see my other mail) |
| @@ -63,7 +63,7 @@ Ora diciamo che hai aggiunto un nuovo file al tuo progetto, un semplice file REA | |||
|
|
|||
| $ vim README | |||
| $ git status | |||
| # On branch master | |||
| # On branch MASTER | |||
There was a problem hiding this comment.
This listing of branch "MASTER" is strange here. Are you sure?
There was a problem hiding this comment.
Ok, i change it to lowercase.
There was a problem hiding this comment.
I can't edit it with the online editor of github. My request falls into a "404 error: this is not the web page you are looking for." And I'm tired of these problems.
There was a problem hiding this comment.
Ok, now it works properly.
|
Yes! My new repo has cb595dd code. I changed it. I try git push -f and git push --force but the result is the same. |
|
Well I guess I'll have to cherry-pick your changes. My main issue is that for foreign languages, I can not do very useful reviews. |
|
This isn't a problem. You can change to lowercase "MASTER". All my italian files are good. Can you split the commits because I'll go crazy for these problems that consume my days? |
|
Hello back, I pushed a branch DavidePastore on progit/progit with a pick up of your changes. Can you review it before I merge it? Thanks in advance. |
|
Hello! :D Ok jnavila! Thanks for your work! I don't know how did you do it but now the work is more simple. Now I edit one thing. What is the next step? |
|
Pulled from cherry-pick. |
No description provided.