outreach-docs icon indicating copy to clipboard operation
outreach-docs copied to clipboard

Dutch translation of website-sections and storyboard

Open Josketobben opened this issue 5 years ago • 11 comments

Josketobben avatar May 01 '19 10:05 Josketobben

Hi @erciccione,

This is meant to add the refuge.md 'nl' file. I see there are a lot of commits, is this normal?

lh1008 avatar May 01 '19 16:05 lh1008

This is meant to add the refuge.md 'nl' file. I see there are a lot of commits, is this normal?

Yes, he probably did the translation in many stages and commit every time. Not a problem, i can squash when merging.

Waiting for a review of the content.

erciccione avatar May 02 '19 13:05 erciccione

Ok, thank you for the clarification.

lh1008 avatar May 02 '19 14:05 lh1008

I committed in one go, I don't know why it's showing commit messages from the previous job. It's the first time I pushed from the command line, maybe it has something to do with that?

Josketobben avatar May 04 '19 09:05 Josketobben

@Josketobben Now i see there are some merge commits, i guess something went wrong while committing locally. Best would be for you to recommit the file using an updated branch, but it's not a big deal, as i said, i can squash while merging.

erciccione avatar May 04 '19 12:05 erciccione

@Josketobben I see you added a commit which add changes to another file. Please change the title accorgingly. next time would be better to open a different PR, since this one has already all commits messed up and adding a non-related one only make things more unclear.

Please contact me if you need help and suggestions on how git's workflow works.

erciccione avatar May 05 '19 11:05 erciccione

There shouldn't be any changes to any other files. These are the changes from the previous job, as I said. I reckon I messed up syncing the local branch on my machine, or am just failing to commit single files somehow.

Josketobben avatar May 06 '19 06:05 Josketobben

@Josketobben commit a58fa5c was added right before my last comment and it's editing another file: wallet_quickstart_nl.md. you can see 2 files got changed in this PR: refuge_en.md and wallet_quickstart_nl.md. Do you mean that you only worked on one file and the changes to the second one are a mistake? if yes, which one is the file you are working on? If you worked on both files please change the title ofthe PR so that we can keep track of the changes.

erciccione avatar May 06 '19 09:05 erciccione

@erciccione I see, git automatically combines pull requests. Yes then it's become two files in total, in the meanwhile. But so no edits, just to be clear. I've updated the title.

Josketobben avatar May 10 '19 13:05 Josketobben

Yes, to open different pull requests the commits should be added on different branches, or git won't be able to see the difference. Thanks for clarifying.

Waiting for reviewers.

erciccione avatar May 10 '19 13:05 erciccione

@Josketobben are you around?

lh1008 avatar Sep 29 '20 23:09 lh1008