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: README.md
+11-4Lines changed: 11 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -46,11 +46,15 @@ If you are new to Github and open source then, visit [here.](https://towardsdata
46
46
git pull upstream master
47
47
git push
48
48
```
49
-
- If you run into a **merge conflict**, you have to resolve the conflict. There are a lot of guides online, or you can try this one by [opensource.com](https://opensource.com/article/20/4/git-merge-conflict).
49
+
50
+
- If you run into a **merge conflict**, you have to resolve the conflict. There are a lot of guides online, or you can try this one by [opensource.com](https://opensource.com/article/20/4/git-merge-conflict).
51
+
50
52
- Checkout to development branch (*name your branch according to the issue name*).
53
+
51
54
```basg
52
55
git checkout -b <branch-name>
53
56
```
57
+
54
58
- Create a folder in [projects directory](https://github.com/chavarera/python-mini-projects/tree/master/projects) according to issue name.
55
59
- Write your code and add to the respective folder in the projects directory, locally.
56
60
- Don't forget to add a `README.md` in your folder, according to the [README_TEMPLATE.](https://github.com/chavarera/python-mini-projects/blob/master/README_TEMPLATE.md)
@@ -60,16 +64,19 @@ If you are new to Github and open source then, visit [here.](https://towardsdata
60
64
git add -A
61
65
git commit -m "<your message>"
62
66
```
67
+
63
68
- Push the code *to your repository*.
69
+
64
70
```bash
65
71
git push origin <branch-name>
66
72
```
73
+
67
74
- Go to the GitHub page of _your fork_, and **make a pull request**:
Read more about pull requests on the [GitHub help pages](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
72
-
- Now wait, until one of us *reviews your Pull Request*! If there are any conflicts, you will get a notification.
79
+
- Now wait, until one of us *reviews your Pull Request*! If there are any conflicts, you will get a notification.
73
80
74
81
## README Template for scripts
75
82
@@ -150,7 +157,7 @@ SR No | Project | Author
150
157
65 | [Test Internet Connection](https://github.com/chavarera/python-mini-projects/tree/master/projects/Internet_connection_check) | [Jacob Ogle](https://github.com/Jakeogle94)
0 commit comments