www.digitalmars.com         C & C++   DMDScript  

digitalmars.D.learn - How do I fix my failed PRs?

reply mark <mark qtrac.eu> writes:
I've done quite a few small corrections/improvements to the 
D-tour's English. Almost all have been accepted.

However, four have not been accepted, apparently for technical 
reasons. But I don't understand what's wrong or what I need to do 
to fix them. (I'm not very knowledgeable about github.)

These are the ones that are held up:

https://github.com/dlang-tour/english/pull/336
https://github.com/dlang-tour/english/pull/335
https://github.com/dlang-tour/english/pull/328
https://github.com/dlang-tour/english/pull/316
Feb 02 2020
next sibling parent bauss <jj_1337 live.dk> writes:
On Sunday, 2 February 2020 at 08:54:02 UTC, mark wrote:

 I've done quite a few small corrections/improvements to the 
 D-tour's English. Almost all have been accepted.

 However, four have not been accepted, apparently for technical 
 reasons. But I don't understand what's wrong or what I need to 
 do to fix them. (I'm not very knowledgeable about github.)

 These are the ones that are held up:

 https://github.com/dlang-tour/english/pull/336
 https://github.com/dlang-tour/english/pull/335
 https://github.com/dlang-tour/english/pull/328
 https://github.com/dlang-tour/english/pull/316


I would create an issue there
Feb 02 2020
prev sibling next sibling parent reply MoonlightSentinel <moonlightsentinel disroot.org> writes:
On Sunday, 2 February 2020 at 08:54:02 UTC, mark wrote:

 However, four have not been accepted, apparently for technical 
 reasons. But I don't understand what's wrong or what I need to 
 do to fix them. (I'm not very knowledgeable about github.)


The Travis log suggest that your PRs contain some whitespace 
errors:


 The command "grep -nr --include \*.md '\s$' . ; test $? -eq 1" 
 exited with 1


You could try to execute the ggrep command locally to identify 
lines containing possible errors.

PS: Feel free to comment on your PR directly s.t. 
reviewers/bypassers can see that you could use some assistance.
Feb 02 2020
next sibling parent mark <mark qtrac.eu> writes:
On Sunday, 2 February 2020 at 12:49:31 UTC, MoonlightSentinel 
wrote:

 On Sunday, 2 February 2020 at 08:54:02 UTC, mark wrote:

 However, four have not been accepted, apparently for technical 
 reasons. But I don't understand what's wrong or what I need to 
 do to fix them. (I'm not very knowledgeable about github.)


 The Travis log suggest that your PRs contain some whitespace 
 errors:


 The command "grep -nr --include \*.md '\s$' . ; test $? -eq 1" 
 exited with 1


 You could try to execute the ggrep command locally to identify 
 lines containing possible errors.

 PS: Feel free to comment on your PR directly s.t. 
 reviewers/bypassers can see that you could use some assistance.


I edit online on github itself so can't check for this kind of 
thing.
Anyway, I've added a comment to each PR so hopefully that will 
help.
Feb 02 2020
prev sibling parent reply bauss <jj_1337 live.dk> writes:
On Sunday, 2 February 2020 at 12:49:31 UTC, MoonlightSentinel 
wrote:

 On Sunday, 2 February 2020 at 08:54:02 UTC, mark wrote:

 However, four have not been accepted, apparently for technical 
 reasons. But I don't understand what's wrong or what I need to 
 do to fix them. (I'm not very knowledgeable about github.)


 The Travis log suggest that your PRs contain some whitespace 
 errors:


 The command "grep -nr --include \*.md '\s$' . ; test $? -eq 1" 
 exited with 1


 You could try to execute the ggrep command locally to identify 
 lines containing possible errors.

 PS: Feel free to comment on your PR directly s.t. 
 reviewers/bypassers can see that you could use some assistance.


Since he just edited markdown files then it shouldn't matter.
Feb 02 2020
parent MoonlightSentinel <moonlightsentinel disroot.org> writes:
On Sunday, 2 February 2020 at 16:29:34 UTC, bauss wrote:

 Since he just edited markdown files then it shouldn't matter.


Why? The grep checks explicitly for trailing whitespace in 
markdown files.
Feb 02 2020
prev sibling parent reply Petar Kirov [ZombineDev] <petar.p.kirov gmail.com> writes:
On Sunday, 2 February 2020 at 08:54:02 UTC, mark wrote:

 I've done quite a few small corrections/improvements to the 
 D-tour's English. Almost all have been accepted.

 However, four have not been accepted, apparently for technical 
 reasons. But I don't understand what's wrong or what I need to 
 do to fix them. (I'm not very knowledgeable about github.)

 These are the ones that are held up:

 https://github.com/dlang-tour/english/pull/336
 https://github.com/dlang-tour/english/pull/335
 https://github.com/dlang-tour/english/pull/328
 https://github.com/dlang-tour/english/pull/316


Hi Mark,

I will take care of reviewing and merging all of the rest of your 
pull requests later this week.

For the most part, my process is:
1. Git checkout a pull request locally
2. Rebase its branch on top of the upstream master one
2. Fixing any whitespace issues (quite easy due to .editorconfig)
3. Reviewing your changes
4. Reviewing the paragraphs as a whole
5. Changing the commit message to something more descriptive, for 
example:

     [chapter-name]: Change being made

     Longer description...

See also: https://chris.beams.io/posts/git-commit/

6. Force-pushing and auto-merging.

Last week I got stuck on step 4 for two of the chapters 

that small fixes won't be sufficient and I started rewriting a 
few paragraphs from scratch. However I ran out of time to finish 
both the rewriting and reviewing the rest of your changes. This 
time I'll try to prioritize merging the easier PRs before going 
down the rabbit whole of rewriting chapters.

Anyway, thanks a lot for your help! I'll try to speed up the 
process on my side.

Cheers,
Petar
Feb 03 2020
parent mark <mark qtrac.eu> writes:
Thanks Petar... I'm in no hurry, just glad that they're in 
process:-)
Feb 03 2020