search

perladvent / Perl-Advent

The Perl Advent calendar
https://perladvent.org/
40 stars 62 forks source link

Star #387

Closed bolangi closed 11 months ago

bolangi commented 11 months ago

Christmas storyline, edits

bolangi commented 11 months ago

Second try, yes quite a few edits. Thank you for your patience!

oalders commented 11 months ago

This has a merge conflict which needs to be resolved.

bolangi commented 11 months ago

Thank you, I see the article is published!

On Mon, Dec 18, 2023 at 07:42:29AM -0800, Olaf Alders wrote:

This has a merge conflict which needs to be resolved.

-- Reply to this email directly or view it on GitHub: https://github.com/perladvent/Perl-Advent/pull/387#issuecomment-1860849672 You are receiving this because you authored the thread.

Message ID: @.***>

-- Joel Roth

bolangi commented 11 months ago

Great to see the high quality of articles this year!

I'm ready to try another pull request. To avoid merge conflicts I'm planning to:

  1. Pull to my fork.
  2. Pull to my local repo
  3. Make a new branch
  4. Open pull request
  5. Push changes, just once, till the PR is merged.

Do you have any suggestions?

Thank you

-- Joel Roth

oalders commented 11 months ago

That sounds like a good start. You can always diff your branch against the branch in the perladvent org before you push, to ensure that you're up to date.