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
`git push` them back to github. These will go to your version of the repository.
46
+
47
+
#### Now Create a PR (Pull Request)
48
+
Go to your version of the repository on github.
49
+
50
+
Click the “New pull request” button at the top.
51
+
52
+
Note that FOSSASIA’s repository will be on the left and your repository will be on the right.
53
+
54
+
Click the green button “Create pull request”. Give a succinct and informative title, in the comment field give a short explanation of the changes and click the green button “Create pull request” again.
55
+
56
+
#### Pulling others’ changes
57
+
Before you make further changes to the repository, you should check that your version is up to date relative to FOSSASIA’s version.
58
+
59
+
Go into the directory for the project and type:
60
+
61
+
`$ git checkout development`
62
+
`$ git pull upstream development --rebase`
63
+
64
+
This will pull down and merge all of the changes that have been made in the original FOSSASIA repository.
Copy file name to clipboardExpand all lines: README.md
+22-6Lines changed: 22 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -6,6 +6,11 @@
6
6
7
7
An events app to discover events happening around the world using the Open Event Platform
8
8
9
+
Application is available here:
10
+
11
+
<ahref='https://play.google.com/store/apps/details?id=com.eventyay.attendee'><imgalt='Get it on Google Play'src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'height="80"/></a>
12
+
<ahref='https://f-droid.org/en/packages/com.eventyay.attendee/'><imgalt='Get it on F-Droid'src='https://f-droid.org/badge/get-it-on.png'height="80"/></a>
13
+
9
14
## Roadmap
10
15
11
16
Planned features & enhancements are:
@@ -19,7 +24,18 @@ Please join our mailing list to discuss questions regarding the project: https:/
19
24
Our chat channel is on gitter [here](https://gitter.im/fossasia/open-event-android)
@@ -54,9 +70,9 @@ Lastly, each class should only perform one task, do it well, and be unit tested
54
70
55
71
## Contributions Best Practices
56
72
57
-
### For first time Contributor
73
+
### For first time Contributors
58
74
59
-
First time contributors can read ContributionHelp.md file for help regarding creating issues and sending pull requests.
75
+
First time contributors can read [CONTRIBUTING.md](/CONTRIBUTING.md) file for help regarding creating issues and sending pull requests.
60
76
61
77
### Branch Policy
62
78
@@ -70,10 +86,10 @@ We have the following branches
70
86
- _versionCode_ : **Integer** : To be monotonically incremented with each merge. Failure to do so will lead to publishing error, and thus is a crucial step before any merge
71
87
- _versionName_ : **String** : User visible version of the app. To be changed following [semantic versioning](http://semver.org/)
72
88
***apk** This branch contains two apk's, that are automatically generated on the merged pull request a) debug apk and b) release apk.
73
-
- Please download and test the app that is using the code from the dev and master branches [here](https://github.com/fossasia/open-event-android/tree/apk).
89
+
- Please download and test the app that is using the code from the development and master branches [here](https://github.com/fossasia/open-event-android/tree/apk).
74
90
### Code practices
75
91
76
-
Please help us follow the best practice to make it easy for the reviewer as well as the contributor. We want to focus on the code quality more than on managing pull request ethics.
92
+
Please help us follow the best practices to make it easy for the reviewer as well as the contributor. We want to focus on the code quality more than on managing pull request ethics.
77
93
78
94
* Single commit per pull request
79
95
* For writing commit messages please read the COMMITSTYLE carefully. Kindly adhere to the guidelines.
0 commit comments