Closed wcchang1115 closed 8 years ago
@wcchang1115 : You have to rebase to the latest upstream HEAD.
I have tried "rebase upstream/master", but it showed merge conflict in zh_TW.ts file. Should I pull the latest version and rewrite it again? Thank you teacher!
@wcchang1115 : Use git rebase
.
I have some troubles in "git rebase ." Please give me some time to solve it. Thank you!
@wcchang1115 : Check the tip: http://fred-zone.blogspot.tw/2015/09/git-fork.html
I have tried "rebase upstream/master", but it showed merge conflict in zh_TW.ts file. Should I pull the latest version and rewrite it again?
IMO drop the translation commit and rebase to latest version then redo the translation is easier.
In my case, I should drop the second commit and do rebase first. Am I right? Thank for your suggestion!
In my case, I should drop the second commit and do rebase first. Am I right?
yes
You can also consider to create a new branch from the latest master branch, and redo all the works, so that you don't need to fight with the conflicts.
Thanks for the suggestion! But I think I better try the Chocobo1's method first. Because it's painless than redo all the works. If that still not work, I will try the way you teach me! Thank you!
@wcchang1115 : We usually don't say "teach" since we participate in collaboration. Instead, you can say, "learn from somebody".
@jserv : Ohh, that's a new concept for me! Thanks! I will remember that!
Sorry all, I have two questions. I have reset my commit and rebase upstream successfully. Will a new push be harmful for this PR? And how should I update this PR? Thanks all !
@wcchang1115 : It is fine to do git push -f
for your revised commits.
@jserv : Thank you sir! But the part of translation I have not finished it!
The Git commit messages should contain Close #133
.
@jserv : Every commits? or just the latest one?
@wcchang1115 I'll respectfully suggest you to create one new branch for a new PR next time, some projects will reject PR from master branch, this is not the git flow working, and may cause problems when you try to rebase your branches or sync with upstream.
@PeterDaveHello : Thanks for your kind suggestion! So I better have two branches, one for sync(my local master) and one for development, and always do PR with the sync one? Do I misunderstand your meaning?
@wcchang1115 : You have to separate the translations and code implementation into two individual commits!
@jserv : OK, I will remember for the next commit. Do I need to separate this commit into two part this time?
@wcchang1115 : I expect there are only two commits:
Use git rebase -i
to rework your patches.
@jserv : I am not sure does the test file need a extra commit. Therefore I commit it first. If this is not necessary, I will squash it.
@jserv : I have separated the commit for the translation and code implementation. And also I change a little bit in undo implementation. Thanks you!
Fix the syntax error and typo "When undo complete, there will be a notification that which phrase being readd."
@jserv : I have fixed the points you mentioned. Thanks for your help!
@wcchang1115 : Merged. Thanks again for your contribution.
Thank you all very much! Your suggestions are very helpful for me, and I learn a lot from this PR! Thanks for your patience and suggestions!
The undo function only supports reverting of phrase deletions. It supports multiple deletions but users have to revert them one by one.
I edited the translation file for the new feature, and updated several line numbers to match the changing of ui and cpp files.
Is there any missing place, please tell me and I will improve it. Thanks!
Resolves: #133