Update 02-setup.md - Add pull.rebase configuration section

[ellio167]

Closes #843

Instructions

Thanks for contributing! :heart:

If this contribution is for instructor training, please email the link to this contribution to [email protected] so we can record your progress. You've completed your contribution step for instructor checkout by submitting this contribution!

Keep in mind that lesson maintainers are volunteers and it may take them some time to respond to your contribution. Although not all contributions can be incorporated into the lesson materials, we appreciate your time and effort to improve the curriculum. If you have any questions about the lesson maintenance process or would like to volunteer your time as a contribution reviewer, please contact The Carpentries Team at [email protected].

You may delete these instructions from your comment.

- The Carpentries

[lexnederbragt]

Thanks for this PR! I agree with placing the solution to #843 here. However, at this point in the lesson, the learner does not yet have an understanding of branches, remotes, how branches can diverge etc. In other words, the explanation given is not tailored to novices. Could it be changed to something short like 'to avoid an annoying later on we also recommend to add the following setting'?

Maybe it would also be good to mention this warning and the solution the first time git pull is used (in 07-github) in case learners have not added the setting.

[ellio167]

Thanks for the good suggestions. I put the note in 08-collab since the git pull usage in 07-github will generally not trigger the hint text (I think).

[emcaulay]

Thanks @ellio167 and @lexnederbragt for your work on this.

I just was a helper when we taught this lesson, so I thought I'd review some of the discussion here to help from that perspective.

I definitely want to see this topic added to the setup section of the lesson, but I think the explanation remains too long. As a novice, when I'm doing the setup I don't care too much about the why of what I'm doing. Just tell me how to get set up so I can start learning.

[lexnederbragt]

Thanks for the updated PR. Could the maintainers please merge this? I think it will make the lesson go quite a bit smoother...

[kekoziar]

rendering is throwing an error, I think based on the link formatting. I'll loop back to this after evaluating the other PRs as part of the lesson infrastructure migration.

However, if someone can troubleshoot the link, it will expedite being able to merge this.

[zkamvar]

Thank you for your contribution. This lesson has migrated to use The Carpentries Workbench, but unfortunately, due to various factors, the Maintainers of this lesson were unable to address this pull request before the transition. Because of this, we had to close your pull request.

Please note that this does not mean that your contribution was not valued. There are many reasons why a pull request is not merged. It's important to remember that the Maintainers are first and foremost people---people who maintain this lesson on a voluntary basis. Sometimes pull requests become stale because other responsibilities take precedence. Thank you for taking the time to open the pull request in the first place.

If you wish to contribute again, you will need to delete and re-fork your repository.

How to contribute

If you wish to contribute, you will need to use the following steps to delete, re-fork, and re-create your pull request (aka the burn it all down strategy):

:video_camera: How to update (delete) your fork https://carpentries.github.io/workbench/faq.html#update-fork-from-styles

1. Save your edits on locally or in a scratch space.
2. Delete your fork
3. Create a new fork or use the "edit" button on the page you wish to edit.
4. Apply your changes (NOTE The Workbench uses a different syntax. Here is a Transition Guide from Styles to Workbench for your reference).

Questions

If you have any questions or would like assistance, please contact @core-team-curriculum (email: [email protected]) or you can respond to this message.