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
+23-8
Original file line number
Diff line number
Diff line change
@@ -5,14 +5,15 @@ jQuery UI provides interactions like Drag and Drop and widgets like Autocomplete
5
5
6
6
If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get started. Or visit the [Using jQuery UI Forum](http://forum.jquery.com/using-jquery-ui) for discussions and questions.
7
7
8
-
If you are interested in helping developing jQuery UI, you are in the right place.
9
-
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).
8
+
If you are interested in helping develop jQuery UI, you are in the right place.
9
+
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui) or in #jquery on irc.freednode.net.
10
+
10
11
11
12
For contributors
12
13
---
13
14
If you want to help and provide a patch for a bugfix or new feature, please take
14
-
a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved),
15
-
in particular check out the [Coding standards](http://wiki.jqueryui.com/w/page/12137737/Coding-standards)
15
+
a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved).
16
+
In particular check out the [Coding standards](http://wiki.jqueryui.com/w/page/12137737/Coding-standards)
16
17
and [Commit Message Style Guide](http://wiki.jqueryui.com/w/page/25941597/Commit-Message-Style-Guide).
17
18
18
19
In general, fork the project, create a branch for a specific change and send a
@@ -24,15 +25,29 @@ For committers
24
25
---
25
26
When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).
26
27
27
-
Unless everything is fine and you can merge directly via GitHub's interface, fetch the remote first:
28
+
Do not merge pull requests directly through GitHub's interface.
29
+
30
+
Fetch the remote first:
31
+
32
+
git fetch [their-fork.git] [their-branch]
33
+
34
+
Then cherry-pick the commit(s):
28
35
29
-
git remote add [username] [his-fork.git] -f
36
+
git cherry-pick [sha-of-commit]
30
37
31
-
If you want just one commit and edit the commit message:
38
+
If you need to edit the commit message:
32
39
33
40
git cherry-pick -e [sha-of-commit]
34
41
42
+
If you need to edit the changes:
43
+
44
+
git cherry-pick -n [sha-of-commit]
45
+
# make changes
46
+
git commit --author="[author-name-and-email]"
47
+
35
48
If it should go to the stable brach, cherry-pick it to stable:
36
49
37
50
git checkout 1-8-stable
38
-
git cherry-pick -x [sha-of-commit]
51
+
git cherry-pick -x [sha-of-commit-from-master]
52
+
53
+
*NOTE: Do not cherry-pick into 1-8-stable until you have pushed the commit from master upstream.*
0 commit comments