You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: _overviews/contribute/guide.md
+1-1
Original file line number
Diff line number
Diff line change
@@ -47,7 +47,7 @@ This is the impatient developer's checklist for the steps to submit a bug-fix pu
47
47
5.[Fix the bug, or implement the new small feature][hackers-implement], include new tests (yes, for bug fixes too).
48
48
6.[Test, rinse][hackers-test] and [test some more][partest-guide] until [all the tests pass][hackers-verify].
49
49
7.[Commit your changes][hackers-commit] to your feature branch in your fork. Please choose your commit message based on the [Git Hygiene](https://github.com/scala/scala#user-content-git-hygiene) section of the Scala project README.
50
-
8. If necessary [re-write git history](https://git-scm.com/book/en/Git-Branching-Rebasing) so that [commits are organized by major steps to the fix/feature](
50
+
8. If necessary [re-write git history](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) so that [commits are organized by major steps to the fix/feature](
51
51
https://github.com/scala/scala#git-hygiene). For bug fixes, a single commit is requested, for features several commits may be desirable (but each separate commit must compile and pass all tests)
52
52
9.[Submit a pull request][hackers-submit].
53
53
10.[Work with a reviewer](https://github.com/scala/scala#reviewing) to [get your pull request merged in][hackers-review].
Copy file name to clipboardExpand all lines: _overviews/contribute/hacker-guide.md
+4-4
Original file line number
Diff line number
Diff line change
@@ -51,7 +51,7 @@ Hacking Scala begins with creating a branch for your work item. To develop Scala
51
51
and [GitHub](https://github.com/). This section of the guide provides a short walkthrough, but if you are new to Git,
52
52
it probably makes sense to familiarize yourself with Git first. We recommend
53
53
54
-
* the [Git Pro](https://git-scm.com/book/en/) online book.
54
+
* the [Git Pro](https://git-scm.com/book/en/v2) online book.
55
55
* the help page on [Forking a Git Repository](https://help.github.com/articles/fork-a-repo).
56
56
* this great training tool [LearnGitBranching](https://pcottle.github.io/learnGitBranching/). One-hour hands-on training helps more than 1000 hours reading.
57
57
@@ -96,7 +96,7 @@ Since in our example, we're going to fix an existing bug
If you are new to Git and branching, read the [Branching Chapter](https://git-scm.com/book/en/Git-Branching) in the Git Pro book.
99
+
If you are new to Git and branching, read the [Branching Chapter](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) in the Git Pro book.
100
100
101
101
### Build
102
102
@@ -333,11 +333,11 @@ Let's go into each of these points in more detail.
333
333
334
334
### Commit
335
335
336
-
The [Git Basics](https://git-scm.com/book/en/Git-Basics) chapter in the Git online book covers most of the basic workflow during this stage.
336
+
The [Git Basics](https://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository) chapter in the Git online book covers most of the basic workflow during this stage.
337
337
There are two things you should know here:
338
338
339
339
1. Commit messages are often the only way to understand the intentions of authors of code written a few years ago. Thus, writing a quality is of utmost importance. The more context you provide for the change you've introduced, the larger the chance that some future maintainer understand your intentions. Consult [the pull request policies](https://github.com/scala/scala/blob/2.12.x/CONTRIBUTING.md) for more information about the desired style of your commits.
340
-
2. Keeping Scala's git history clean is also important. Therefore we won't accept pull requests for bug fixes that have more than one commit. For features, it is okay to have several commits, but all tests need to pass after every single commit. To clean up your commit structure, you want to [rewrite history](https://git-scm.com/book/en/Git-Branching-Rebasing) using `git rebase` so that your commits are against the latest revision of `master`.
340
+
2. Keeping Scala's git history clean is also important. Therefore we won't accept pull requests for bug fixes that have more than one commit. For features, it is okay to have several commits, but all tests need to pass after every single commit. To clean up your commit structure, you want to [rewrite history](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) using `git rebase` so that your commits are against the latest revision of `master`.
341
341
342
342
Once you are satisfied with your work, synced with `master` and cleaned up your commits you are ready to submit a patch to the central Scala repository. Before proceeding make sure you have pushed all of your local changes to your fork on GitHub.
0 commit comments