Skip to content

.。。。。 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HuanyangJAVA wants to merge 4,375 commits into
base: feature/move-jquery-from-cdn-to-local
Choose a base branch
from
Open

.。。。。 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4375 commits
Select commit Hold shift + click to select a range
2174ad6
Merge branch 'gh-pages' into work
amaruk May 9, 2021
3e58434
Merge pull request #2064 from cjyin/work
amaruk May 9, 2021
ad7c5b4
Merge branch 'gh-pages' into work
amaruk May 9, 2021
659991d
Merge pull request #2065 from frankjm66/work
amaruk May 9, 2021
bcac7a2
Merge branch 'gh-pages' into work
amaruk May 11, 2021
cd69698
Merge pull request #2066 from yyq90/work
amaruk May 11, 2021
6c3b641
Merge branch 'gh-pages' into work
amaruk May 11, 2021
c955946
Merge pull request #2067 from sail-Yang/work
amaruk May 11, 2021
debe990
Merge pull request #2068 from XiangqianMa/work
amaruk May 11, 2021
acc1103
add comment
berry-raccoon Apr 20, 2021
8862730
Merge branch 'berry-raccoon-work' into gh-pages
amaruk May 11, 2021
9a160d1
add my impression
pH-ouc May 13, 2021
9f8225a
Add my impressiong by zhujz-git
zhujz-git May 15, 2021
f3b7273
Add my impression
Chen-Xiao-Hui May 18, 2021
8612143
Update index.html
863zq May 18, 2021
b63ab8f
Add my impression
happysnaker May 21, 2021
e76c356
Merge pull request #2069 from pH-ouc/work
amaruk May 22, 2021
b845b7d
Merge pull request #2070 from zhujz-git/work
amaruk May 22, 2021
c21e125
Merge branch 'gh-pages' into work
amaruk May 22, 2021
b75932c
Merge pull request #2071 from Chen-Xiao-Hui/work
amaruk May 22, 2021
bf7c569
Merge pull request #2072 from 863zq/test_pr
amaruk May 22, 2021
e80ed81
Merge pull request #2075 from happysnaker/work
amaruk May 22, 2021
ec8b47b
Merge branch 'gh-pages' into work
amaruk May 22, 2021
b5e6855
Update index.html
amaruk May 22, 2021
d7ebc37
Merge pull request #2052 from gitbfly/work
amaruk May 22, 2021
d0d9fa4
Merge branch 'work' of https://github.com/wj1211/first-pr into wj1211…
amaruk May 23, 2021
9f4ed6b
Merge branch 'wj1211-work' into gh-pages
amaruk May 23, 2021
bb8f215
Merge branch 'gh-pages' of https://github.com/ituring/first-pr into g…
amaruk May 23, 2021
a9cda0c
Merge PR #2058.
amaruk May 23, 2021
a2ba799
Merge branch 'aceb985-work' into gh-pages
amaruk May 23, 2021
bee428b
2021/5/27提交pr
how-dare-you May 27, 2021
8483cdd
add TAKO's impression
TAKO-1027 May 29, 2021
1b05118
Merge branch 'gh-pages' into work
TAKO-1027 May 29, 2021
54a1ce7
Update index.html
logycoconut Jun 2, 2021
5e0d567
Merge pull request #2077 from how-dare-you/gh-pages
amaruk Jun 5, 2021
92f1933
Merge pull request #2078 from TAKO-1027/work
amaruk Jun 5, 2021
8d5812d
Merge branch 'gh-pages' into patch-3
amaruk Jun 5, 2021
6503e3e
add my impression
May 18, 2021
678e373
Merge PR 2073.
amaruk Jun 5, 2021
8eabf21
Merge branch 'crosswang-work' into gh-pages
amaruk Jun 5, 2021
578e5e0
add my impression for this book
AlexLPJ Jun 6, 2021
027cc39
Add my impression 2021/06/06
Randsome-Arisa Jun 6, 2021
3a8ff33
Merge pull request #2079 from logycoconut/patch-3
amaruk Jun 7, 2021
f397145
Merge pull request #2080 from AlexLPJ/test
amaruk Jun 7, 2021
80deea4
Merge branch 'gh-pages' into work
amaruk Jun 7, 2021
a0d6492
Merge pull request #2081 from Randzom-Arisa/work
amaruk Jun 7, 2021
b18d514
Add my impression
Yimi81 Jun 7, 2021
37595aa
Add a little thought
y4lp Jun 8, 2021
ed9b2a8
Add my impression
geometryolife Jun 9, 2021
67203be
Add my impression
Jun 10, 2021
4666017
Add my impression
xuyuzhuang11 Jun 15, 2021
6834874
add my inpression
xiaobinqt Jun 18, 2021
7d07871
Thanks from J. Best wishes to WWT. Happy graduation~
jalain Jun 24, 2021
667c061
merge xiaobinxq and xuyuzhuang11
jalain Jun 28, 2021
df2dc16
Add my impression
WAWLixiong Jun 30, 2021
9d82cde
Merge pull request #2082 from Yimi81/work
liubin Jul 1, 2021
96d1081
Merge pull request #2083 from y4lp/work
liubin Jul 1, 2021
19dd9e1
github test
Jul 6, 2021
a43eef2
Add my impression
chaochao42 Jul 7, 2021
387b208
add my test
Jul 7, 2021
5e593a0
add github test
Jul 7, 2021
e277286
Add my impression
JasminejmChen Jul 9, 2021
354a966
Add my impression
liushuduo Jul 16, 2021
ce9f0eb
Merge branch 'gh-pages' into work
amaruk Jul 17, 2021
9c30a4b
Merge pull request #2084 from geometryolife/work
amaruk Jul 17, 2021
55104c5
Merge branch 'gh-pages' into work
amaruk Jul 17, 2021
e480fc9
Merge pull request #2085 from 1163235668/work
amaruk Jul 17, 2021
2b98af2
Merge branch 'gh-pages' into work
amaruk Jul 17, 2021
e816b9a
Merge pull request #2086 from xuyuzhuang11/work
amaruk Jul 17, 2021
225a20b
Merge branch 'gh-pages' into dev_weibin
amaruk Jul 18, 2021
d99f54a
Merge pull request #2087 from xiaobinqt/dev_weibin
amaruk Jul 18, 2021
e94f137
Merge branch 'gh-pages' into work
amaruk Jul 18, 2021
2fc8f86
Merge pull request #2088 from jalain/work
amaruk Jul 18, 2021
100d0d9
Merge branch 'gh-pages' into new
amaruk Jul 18, 2021
7df8a15
Merge pull request #2089 from WAWLixiong/new
amaruk Jul 18, 2021
1d77eac
Merge branch 'gh-pages' into gh-pages
amaruk Jul 18, 2021
61ab26f
Merge pull request #2090 from jalain/gh-pages
amaruk Jul 18, 2021
121f02a
Update README.md
amaruk Jul 18, 2021
da32e12
Merge pull request #2091 from Linux-yzy/slow-blink
amaruk Jul 18, 2021
7c67631
Merge branch 'gh-pages' into work
amaruk Jul 18, 2021
9751150
Merge pull request #2092 from Chaogade/work
amaruk Jul 18, 2021
9daa3f0
Merge branch 'gh-pages' into gh-pages
amaruk Jul 18, 2021
d242bc2
Merge pull request #2093 from Linux-yzy/gh-pages
amaruk Jul 18, 2021
8efe2b3
add my comment
AE86CONG Jul 18, 2021
4a8d90b
Add my impression-Rongxuan He
RyanHe123 Jul 18, 2021
3cf8c36
Add my impression
qingyun-code Jul 25, 2021
f255644
add my impression
VvVs Jul 27, 2021
bedafc2
Add my impression
worture Jul 29, 2021
362feb3
Add my impression
monitor14 Jul 30, 2021
ca8413c
Add my impression
JorjininMath Aug 2, 2021
7e68310
Add my impresion
maxewell Aug 3, 2021
4a44bc5
pr test
Aug 3, 2021
57a9d02
HongKong
letsencrypt6 Aug 5, 2021
4ab9202
Add my impression
GutsTang Aug 5, 2021
55b919b
add my impression
shikingram Aug 5, 2021
7ab965f
add my impression
shikingram Aug 5, 2021
b01188d
Add Alowree's impression
Alowree Aug 5, 2021
ef4d349
Add my impression
Chamior Aug 6, 2021
f37bbe9
Add my impression
GutsTang Aug 9, 2021
7b2f512
Update index.html
zqfmaster Aug 10, 2021
90ec752
Update index.html
zqfmaster Aug 10, 2021
cac42d1
Add my impression
Aug 10, 2021
cde16cc
Add my impression of thanks.
HiGiaNa Aug 11, 2021
a8a7495
Add my impression
jiansun-max Aug 14, 2021
e4d280f
Merge pull request #2098 from AE86CONG/work
liubin Aug 19, 2021
0384b07
Merge pull request #2110 from K1ngram4/work
liubin Aug 19, 2021
ed456b8
Add my impression (#2121)
pilgrimmeng Aug 19, 2021
33f982c
Merge branch 'gh-pages' into guang
upadmin Aug 19, 2021
07af8ab
Merge pull request #2109 from upadmin/guang
liubin Aug 19, 2021
80306f3
Add my impression
Dafunk-759 Aug 23, 2021
f838720
Add my impression
liux-github123 Aug 25, 2021
972f571
Add my impression
idmimida Aug 27, 2021
8bafca7
Add my impression
Nighthawks0230 Aug 28, 2021
edfa601
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
8414dee
Merge pull request #2094 from JasminejmChen/work
amaruk Aug 28, 2021
cf7323d
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
32f38ad
Update index.html
amaruk Aug 28, 2021
8a1c5f7
Merge pull request #2095 from lsd83127/work
amaruk Aug 28, 2021
8bea5e4
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
3ac1778
Merge pull request #2099 from RyanHe123/work
amaruk Aug 28, 2021
b1eb87d
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
5f9c036
Merge pull request #2101 from qingyun-code/work
amaruk Aug 28, 2021
af00578
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
7b836d5
Merge pull request #2102 from VvVs/work
amaruk Aug 28, 2021
dafcaff
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
973950c
Merge pull request #2103 from worture/work
amaruk Aug 28, 2021
539f7ed
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
95c4785
Merge pull request #2104 from monitor14/work
amaruk Aug 28, 2021
1327822
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
caea377
Merge pull request #2106 from JorjininMath/work
amaruk Aug 28, 2021
59ac4e7
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
7e67eeb
Merge pull request #2107 from maxewell/work
amaruk Aug 28, 2021
219dc11
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
5df5e99
Merge pull request #2108 from hzj1021/work
amaruk Aug 28, 2021
0d382df
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
ffc68bc
Merge pull request #2111 from Alowree/work
amaruk Aug 28, 2021
de52e1d
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
98bb054
Merge pull request #2112 from Chamior/work
amaruk Aug 28, 2021
109f452
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
d4d4e83
Merge pull request #2114 from GutsTang/work
amaruk Aug 28, 2021
0b9830e
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
14b155d
Merge pull request #2118 from opisreal/work
amaruk Aug 28, 2021
f9404ed
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
94dfa7a
Merge pull request #2119 from kuoping/work
amaruk Aug 28, 2021
ddbdf1f
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
9e766a1
Merge pull request #2120 from jiansun-max/work
amaruk Aug 28, 2021
4592443
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
4596ad0
Merge pull request #2123 from Dafunk-759/work
amaruk Aug 28, 2021
cb78829
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
19756bf
Merge pull request #2124 from liux-github123/work
amaruk Aug 28, 2021
780cb1b
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
d1fccd6
Merge pull request #2125 from idmimida/work
amaruk Aug 28, 2021
acff5f9
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
a59044b
Merge pull request #2126 from Nighthawks0230/work
amaruk Aug 28, 2021
d0fae50
Merge branch 'gh-pages' into work
amaruk Aug 28, 2021
5d74680
Merge pull request #2116 from zqfmaster/work
amaruk Aug 28, 2021
6334114
Add my impressiom
haitao-69 Sep 9, 2021
9e0d512
add my impression
wyxgoishin Sep 23, 2021
019e6f7
Add my impression
xinyuyu Oct 2, 2021
c0aa3eb
Add my impression
xinyuyu Oct 2, 2021
dc4e7ee
Add my impression
ztrbq Oct 13, 2021
a04ec30
Add my impression
LiJianGuo2333 Oct 13, 2021
55a164c
add my impression
DajunPlanet Oct 23, 2021
cba7d3f
Add my impression
WNNGGU Oct 24, 2021
1c5234e
Merge pull request #2156 from WNNGGU/work
liubin Oct 25, 2021
f516a66
Merge pull request #2154 from DajunPlanet/work
liubin Oct 25, 2021
aa06a1d
Merge pull request #2153 from LiJianGuo2333/work
liubin Oct 25, 2021
9001265
Merge pull request #2151 from ztrbq/work
liubin Oct 25, 2021
0014f1a
Merge pull request #2145 from xinyuyu/my-work-1
liubin Oct 25, 2021
a09b261
Merge pull request #2140 from wyxgoishin/work
liubin Oct 25, 2021
190dd00
Merge pull request #2136 from haitao-69/work
liubin Oct 25, 2021
54b10cd
Add my impression
Algo-Goer Oct 25, 2021
7945c0b
Merge pull request #2159 from Algo-Goer/work
Algo-Goer Oct 25, 2021
67bf1c9
Add my impression
Algo-Goer Oct 25, 2021
5a338b6
Merge pull request #2160 from Algo-Goer/work
Algo-Goer Oct 25, 2021
8a8f8fe
add my impression
hutushanren Nov 5, 2021
67ac96b
Add my impression
Poseid00 Nov 7, 2021
d0abd6d
test first pull request
zxyboy Nov 8, 2021
931cdfa
add my impression
ITZengWei Nov 19, 2021
9c2c765
小陈同学来测试
Wing-Sing Dec 5, 2021
b28b729
add my impression
Wing-Sing Dec 5, 2021
8bc09fa
小橙同学
Wing-Sing Dec 5, 2021
87f3964
Add my impression
GAI0603 Dec 15, 2021
273175c
Add my impression
Dec 18, 2021
f82cb88
Add my impression
XxxuLimei Dec 19, 2021
5ca67af
Merge pull request #1 from XxxuLimei/work
XxxuLimei Dec 19, 2021
63e99ad
Merge pull request #2200 from XxxuLimei/gh-pages
liubin Dec 20, 2021
98b9002
Merge pull request #2199 from hoiming/work
liubin Dec 20, 2021
4e31b23
Merge pull request #2197 from GAI0603/work
liubin Dec 20, 2021
909ade8
Merge pull request #2168 from Poseid00/work
liubin Dec 20, 2021
898e17c
Merge pull request #2169 from zxyboy/gh-pages
liubin Dec 20, 2021
711b3da
Merge pull request #2178 from ITZengWei/work
liubin Dec 20, 2021
014b376
Merge pull request #2163 from hutushanren/gh-pages
liubin Dec 20, 2021
f5e4ae3
add my impression
leokyler Jan 22, 2022
af13e00
Update index.html
Wing-Sing Jan 30, 2022
d72cfa3
Merge branch 'gh-pages' into work
Wing-Sing Jan 30, 2022
b0bc2b4
Merge pull request #2189 from chenwingsing/work
liubin Feb 15, 2022
c3bf9a9
Add my impression
HuangYL-0619 Jun 12, 2022
22fd4c5
add my impression
rubyy6 Jun 16, 2022
270fdd5
Update index.html
filefi Jun 22, 2022
3df7543
Update index.html
filefi Jun 22, 2022
ad44d9e
Add my impresion
usagi3067 Jul 22, 2022
744ce3a
Add my impression
Jul 25, 2022
d585e7a
add my pr
Jul 31, 2022
59da62d
Add my impression
1264693923 Aug 8, 2022
f025172
Merge pull request #2357 from 1264693923/work
liubin Aug 15, 2022
226b82a
Merge pull request #2351 from ShiMaRing/work
liubin Aug 15, 2022
5c2d6b3
Merge pull request #2346 from happyhelloworld/work
liubin Aug 15, 2022
e4c9dac
Add my impression
Takea-nap Aug 27, 2022
c4cd079
Add my impression
Aug 30, 2022
8f2f68e
Add my impression
sysulyccc Sep 13, 2022
dc6910b
Merge pull request #2377 from sysulyccc/work
liubin Sep 14, 2022
f38f984
Merge pull request #2365 from Takea-nap/work
liubin Sep 14, 2022
893b65f
Merge pull request #2370 from sodiumZz/work
liubin Sep 14, 2022
e244c7c
Merge pull request #2343 from usagi3067/work
liubin Sep 14, 2022
32a24b0
add my pr part 1
liubin Sep 14, 2022
4b210e8
Merge pull request #2378 from liubin/pr-1
liubin Sep 14, 2022
3915822
add my pr part 2
liubin Sep 14, 2022
3f5bfa1
Merge pull request #2379 from liubin/pr-2
liubin Sep 14, 2022
e5b565a
Add my impression
Clov614 Apr 18, 2022
02e822b
Merge pull request #2317 from HuangYL-0619/work
liubin Sep 14, 2022
62ec44f
Merge pull request #2319 from rubyy6/work
liubin Sep 14, 2022
ce1a7f1
Merge pull request #2322 from filefi/dev
liubin Sep 14, 2022
c31cebe
Merge pull request #2227 from leo-kl/work
liubin Sep 14, 2022
e96e44b
update how to fix conflict
liubin Sep 14, 2022
3d40dcd
Merge pull request #2380 from liubin/pr-2
liubin Sep 14, 2022
ce498ef
delete '.DS_Store'
liubin Sep 14, 2022
15fd588
Merge pull request #2381 from liubin/rm-ds-store
liubin Sep 14, 2022
a4e624b
typo
Clov614 Sep 14, 2022
c326abe
Merge pull request #2288 from Clov614/work
liubin Sep 14, 2022
9a60b84
Add my impression again
cy-Yin Jun 27, 2022
8a507fd
Merge pull request #2324 from cy-Yin/work
liubin Sep 15, 2022
a19e691
Add my impression
intercore Sep 15, 2022
52f81c0
Add my impression
molushu Sep 16, 2022
69e6ad4
Merge pull request #2382 from intercore/work
liubin Sep 16, 2022
aa5a915
update push request
luckyeven Sep 16, 2022
9727da3
Add my impression
Intvarinit Sep 18, 2022
125b3a7
first pr
sqlcn Sep 9, 2022
0a15e44
Merge pull request #2384 from luckyeven/pr-2
liubin Sep 19, 2022
eb43f19
Merge pull request #2385 from molushu/work
liubin Sep 19, 2022
2b399c7
Merge pull request #2386 from Intvarinit/work
liubin Sep 19, 2022
afcdf24
Merge pull request #2387 from sqlcn/work
liubin Sep 19, 2022
59e7edb
Add my impression
Sep 20, 2022
3359610
Merge pull request #2388 from olqegw/work
liubin Sep 21, 2022
fd1f63f
add my impression
Kingwcl Sep 27, 2022
2c9b01c
hzx add impression
hezhengxiang Oct 4, 2022
ac0a4c0
Add my impression
cergyqiuqiu Oct 5, 2022
5a679e3
Merge pull request #2390 from Kingwcl/work
liubin Oct 17, 2022
ecf6a19
Merge pull request #2395 from hezhengxiang/work
liubin Oct 17, 2022
ea4fe16
Merge pull request #2397 from cergyqiuqiu/work
liubin Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[http://ituring.github.io/first-pr/](http://ituring.github.io/first-pr/)

Git冲突时的解决方法
PR/Git冲突时的解决方法

- [Resolving merge conflicts](https://help.github.com/articles/resolving-merge-conflicts/)
- [如何解决 PR 冲突问题](https://github.com/ituring/first-pr/wiki/%E5%A6%82%E4%BD%95%E8%A7%A3%E5%86%B3-PR-%E5%86%B2%E7%AA%81%E9%97%AE%E9%A2%98)
- [Resolving a merge conflict from the command line](https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/)
Binary file modified images/cover.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading