bitcoin-dev-philosophy / btcphilosophy

Other
49 stars 21 forks source link

Corrections and rephrasing #58

Closed MartaTurchetta closed 1 year ago

MartaTurchetta commented 1 year ago
kallerosenbaum commented 1 year ago

Welcome to the project @MartaTurchetta ! Looking forward to working with you on this.

kallerosenbaum commented 1 year ago

@MartaTurchetta Also, HUGE plus that you work directly on the adoc files on GitHub. It makes the review/collaboration/discussion so much easier and better. I'm hate sending annotated PDFs around.

MartaTurchetta commented 1 year ago

Welcome to the project @MartaTurchetta ! Looking forward to working with you on this.

@MartaTurchetta Also, HUGE plus that you work directly on the adoc files on GitHub. It makes the review/collaboration/discussion so much easier and better. I'm hate sending annotated PDFs around.

@kallerosenbaum Thank you very much, I'm so glad to contribute to this work! I gotta admit that I have edited files directly on GitHub only once before, so please be patient with me and always feel free to point out anything about the functioning of GitHub as I'm still learning all the tricks.

kallerosenbaum commented 1 year ago

@MartaTurchetta I'm not sure why you closed this PR? I liked all of your edits in it. Is there possibly some misunderstanding?

The general workflow is typically:

  1. You make changes on a branch
  2. You create a Pull Request (PR), from that branch to the master branch
  3. Review takes place and comments are made on the PR
  4. You make changes in the form of new commits to the branch. The PR will automatically be updated with your commits.
  5. Everyone is happy with the PR and we merge it to the master branch to incorporate your changes.

Of course, steps 3 and 4 can be repeated several times.

MartaTurchetta commented 1 year ago

@MartaTurchetta I'm not sure why you closed this PR? I liked all of your edits in it. Is there possibly some misunderstanding?

The general workflow is typically:

  1. You make changes on a branch
  2. You create a Pull Request (PR), from that branch to the master branch
  3. Review takes place and comments are made on the PR
  4. You make changes in the form of new commits to the branch. The PR will automatically be updated with your commits.
  5. Everyone is happy with the PR and we merge it to the master branch to incorporate your changes.

Of course, steps 3 and 4 can be repeated several times.

MartaTurchetta commented 1 year ago

@kallerosenbaum Sorry about closing the PR, I must have done it accidentally! It might have happened while I was re-organizing my repository or while I was making a new PR? Not so sure, but anyway thank you for letting me know and excuse my initial inexperience

kallerosenbaum commented 1 year ago

@MartaTurchetta no need to apologize! I think the PR was closed because you renamed the branch, edited_1, that the PR was created from. Anyway, it's back to open now, so all good.

kallerosenbaum commented 1 year ago

Nice! I'll merge this!