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
{{ message }}
This repository was archived by the owner on Jul 6, 2020. It is now read-only.
- If your checks have passed, your PR will be assigned a reviewer who will review your code and provide comments. Please address each review comment by pushing new commits to the same branch (the PR will automatically update, so you don’t need to submit a new one). Once you are done, comment below each review comment marking it as “Done”. Feel free to use the thread to have a discussion about comments that you don’t understand completely or don’t agree with.
70
70
71
-
- Once all comments are addressed, the reviewer will give an LGTM (‘looks good to me’) and merge the PR.
72
-
4. Rules for great commit messages:
71
+
- Once all comments are addressed, the maintainer will approve the PR.
72
+
73
+
4. Once you get reviewed by a mentor and done with all the required changes, squash all the commits:
74
+
75
+
```
76
+
git checkout <branch_name>
77
+
git rebase -i HEAD~N (N is the number of commits to be squashed)
78
+
```
79
+
80
+
Then a screen will appear with all N commits having "pick" written in front of every commit.Change pick to s for the last N-1 commits and let it be pick for the first one.
81
+
82
+
Press esc button and type ":wq" to save the change and close the screen. Now a new screen will appear asking you to change commit message. Change it accordingly and save it.
83
+
84
+
```
85
+
git push origin <branch_name> --force
86
+
```
87
+
88
+
For further query regarding rebasing, visit https://github.com/todotxt/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit
89
+
90
+
Once rebasing is done, the reviewer will approve and merge the PR.
91
+
92
+
5. Rules for great commit messages:
73
93
74
94
- Write your commit message in the imperative: "Fix bug" and not "Fixed bug" or "Fixes bug."
0 commit comments