Closed javascript-translate-bot closed 1 month ago
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 24 committers have signed the CLA.
:white_check_mark: joaquinelio
:white_check_mark: iliakan
:white_check_mark: mrtoorich
:white_check_mark: Alexandre887
:white_check_mark: kricsleo
:x: Oleksandr Tkachenko
:x: wdscxsj
:x: rahulrao0209
:x: sagarpanchal
:x: smith558
:x: nakhodkin
:x: qadzek
:x: JaFro96
:x: alexandermirzoyan
:x: CJDumbleton
:x: mikayel00
:x: eedrxs
:x: nepikn
:x: Filin3
:x: FloffyGarlic
:x: sneeed
:x: pvepamb1
:x: shallow-beach
:x: ellie-heidari
Aaaaaahhhhh! So long without, too many changes
I wish I've insisted on my "where's my sync!!" issue before.
Not sure I can finish before next sync
Rev parcial Next
...termine?
Queemboleeeeee
Hey @iliakan , happy to see you around again!... Almost.
See, Instead of doing my own merges as usually do, I started to work in THIS PR Not the first time. Sometimes the bot closed the sync to open a new one, so I just ignored the new and reopen-fnish-merge the old partially done PR, next sync would fix any no merged updates.
Now, you pushed old changes again or reverted all my changes, I dont know yet
I cant push this and I dont wanna do the same changes, several days of work, again from scratch
Hi @iliakan ,
After my "terminé" ( " I finished it" ) comment, and before your merge, there were many commits. Not sign of them now. 49 files edited. Then the forced push. It does not look good.
@joaquinelio sorry to hear about the problems.
I have quite a lot on my plate today and tomorrow, can you explain in detail? I'll look into it on Thursday.
P.S. Your commits were discarded? Did you do them locally? Then they're in your local git.
@iliakan
Nothing to recover I guess. I just was very CURIOUS about what happened. That was odd.
I'll close the issues and start again when I can.
I can't work locally right now, only online.
My mistake was editing the SP bot sync branch directly instead of merging bot's sync to my personal branch
If I get healthy and unbroke again and I find a cheap unexploded u$s 100 notebook to work with I'll do my own merges again.
Regards And stay healthy
Oh, I understand it better now.
Maybe this information can help:
If the forced push was performed recently, GitHub's event log might help. GitHub tracks events like pushes, and you can see this information in the repository's events section, accessible via the repository URL followed by /events, e.g., https://github.com/username/repo/events.
If we can find out a commit hash, then there's a possibility it's still in github history.
!! It's all here, @iliakan
https://github.com/javascript-tutorial/es.javascript.info/activity?ref=sync-b258d7d5
My last 24 commits shown there under 3 bombs
But I have no clue how to... Eh... something
Even harder with my phone
Cool! Then you just need to checkout your latest commit by its id from github, I guess?
Surely Google knows the answer how to do it =)
I thought a force-push erased my commit history with your history.
Mm... I'll study it
Usually commits stay in history for some time (30 days+?) in git. Until GC cleans them.
For github don't know.
Not from my phone. Maybe the nurse's office have a pc...
Anyway, @iliakan Did you realize bot is pushing always the same sync branch? It doesn't leave much time to do the review.
Current OPEN sync PR 726 have the same name
This PR was automatically generated to merge changes from en.javascript.info at b258d7d5
Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.
Alternatively, you can close this PR and merge conflicting changes manually.
The following files have conflicts and may need updates of the translations:
Click to open a list of 22 files
- [ ] [1-js/02-first-steps/04-variables/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/04-variables/article.md) - [ ] [1-js/02-first-steps/05-types/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/05-types/article.md) - [ ] [1-js/03-code-quality/06-polyfills/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/06-polyfills/article.md) - [ ] [1-js/04-object-basics/04-object-methods/8-chain-calls/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/04-object-methods/8-chain-calls/task.md) - [ ] [1-js/04-object-basics/09-object-toprimitive/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/09-object-toprimitive/article.md) - [ ] [1-js/05-data-types/02-number/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/02-number/article.md) - [ ] [1-js/05-data-types/03-string/3-truncate/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/03-string/3-truncate/task.md) - [ ] [1-js/05-data-types/04-array/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/04-array/article.md) - [ ] [1-js/05-data-types/05-array-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/05-array-methods/article.md) - [ ] [1-js/05-data-types/06-iterable/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/06-iterable/article.md) - [ ] [1-js/05-data-types/10-destructuring-assignment/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/10-destructuring-assignment/article.md) - [ ] [1-js/08-prototypes/04-prototype-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/08-prototypes/04-prototype-methods/article.md) - [ ] [1-js/13-modules/02-import-export/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/13-modules/02-import-export/article.md) - [ ] [2-ui/3-event-details/6-pointer-events/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/6-pointer-events/article.md) - [ ] [2-ui/4-forms-controls/3-events-change-input/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/4-forms-controls/3-events-change-input/article.md) - [ ] [2-ui/99-ui-misc/02-selection-range/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/article.md) - [ ] [2-ui/99-ui-misc/03-event-loop/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/03-event-loop/article.md) - [ ] [6-data-storage/01-cookie/article.md](/javascript-tutorial/en.javascript.info/commits/master/6-data-storage/01-cookie/article.md) - [ ] [6-data-storage/03-indexeddb/article.md](/javascript-tutorial/en.javascript.info/commits/master/6-data-storage/03-indexeddb/article.md) - [ ] [7-animation/2-css-animations/article.md](/javascript-tutorial/en.javascript.info/commits/master/7-animation/2-css-animations/article.md) - [ ] [7-animation/3-js-animation/article.md](/javascript-tutorial/en.javascript.info/commits/master/7-animation/3-js-animation/article.md) - [ ] [9-regular-expressions/11-regexp-groups/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/11-regexp-groups/article.md)To merge changes manually (instead of merging this PR):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
git checkout master
git pull upstream master
git checkout --ours <path>
git diff --word-diff master...upstream/master <path>
(please note: three dots in the command)git push origin master
This PR will be closed and replaced with a new one in a few days.