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 Sep 20, 2019. It is now read-only.
There should be minimal branches in the main upstream of angular-ui/ui-leaflet.
5
+
6
+
Currently there should only be:
7
+
8
+
- master
9
+
- gh-pages (active website)
10
+
- leaflet-1.X (IE Some major next release branch)
11
+
12
+
Any an all other items as a dev **INCLUDING** admins and devs that have write permissions to the repo. Should work within their own fork
13
+
and PR changes to this repository.
14
+
15
+
There are exceptions to this like accidents and major/minor collaboration branches (where many devs touch same code work together piror to being ready).
16
+
17
+
As an admin and dev with write permissions the majority of the time you should be submitting PRS. However if you need to push your changes to the upstream then please do the following.
-`git merge upstream/master` (your in upstreamMaster)
28
+
-`git push upstream`
29
+
30
+
Origin should be your personal fork and upstream should be angular-ui . If we need to explain this fully then you probably should not have admin nor write perms.
31
+
32
+
## Huge PRs (Many Commits)
33
+
34
+
If you can and you know what you are doing please rebase via `git rebase -i` to squash commits.
35
+
36
+
## Remember
37
+
With great power comes great responsibility. If it is abused it will be taken awayith!
0 commit comments