Skip to content
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.

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

Release/2.0 #41

Merged
merged 52 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
37db582
Add su_task1.txt
unitasium Mar 1, 2024
1eb6679
add my test file
wenbinyu-PU Mar 1, 2024
acfa219
upload new file (#11)
banghuazhao Mar 1, 2024
92982e5
Merge branch 'develop' into task/wenbin-task1
banghuazhao Mar 8, 2024
baaeeb4
git workshot test
Mar 8, 2024
e50c79f
test
Frankemily Mar 8, 2024
4355c76
correct file
wenbinyu-PU Mar 8, 2024
a71a78b
Add sichen_task2.txt
sichenliuPU Mar 8, 2024
ec50da9
Update README
unitasium Mar 8, 2024
1fa4074
Merge pull request #13 from wenbinyugroup/task/wenbin-task1
wenbinyu-PU Mar 8, 2024
57197e4
Merge pull request #17 from wenbinyugroup/task/su-task1
unitasium Mar 8, 2024
bb376a8
Add sichen_task2.txt
sichenliuPU Mar 8, 2024
a5a45de
Merge pull request #16 from wenbinyugroup/task/haodong-task2
duhd1993 Mar 8, 2024
eb3a043
Merge pull request #23 from wenbinyugroup/task/sichen-task2
sichenliuPU Mar 8, 2024
5022fdd
Merge pull request #18 from Frankemily/Frankemily
Frankemily Mar 8, 2024
f592ea4
do not overwrite my changes
wenbinyu-PU Mar 29, 2024
26ace1e
Update Readme
Mar 29, 2024
0b8800e
change readme
sichenliuPU Mar 29, 2024
c2dbbfc
do not overwrite my changes
wenbinyu-PU Mar 29, 2024
2bdc11d
Merge branch 'main' into task/sichen-task2
Frankemily Mar 29, 2024
0cce272
change readme1
bagla0 Mar 29, 2024
ffa3bfa
change
Frankemily Mar 29, 2024
72b2999
change readme (#30)
banghuazhao Mar 29, 2024
02e5158
merged
wenbinyu-PU Mar 29, 2024
656ca06
change readme
sichenliuPU Mar 29, 2024
dfa9c58
Merge pull request #28 from wenbinyugroup/task/wenbin-task2
wenbinyu-PU Mar 29, 2024
42a8797
Merge branch 'develop' into task/sichen-task2
sichenliuPU Mar 29, 2024
c265b78
Merge pull request #31 from wenbinyugroup/task/sichen-task2
sichenliuPU Mar 29, 2024
7b0765d
merged
unitasium Mar 29, 2024
bc7328d
merger2
bagla0 Mar 29, 2024
55044e5
merged
unitasium Mar 29, 2024
5f4d759
Merge pull request #32 from wenbinyugroup/task/su-task2
unitasium Mar 29, 2024
c37006c
merged
Frankemily Mar 29, 2024
bd7cda9
merged3
bagla0 Mar 29, 2024
ebbe763
merged
Frankemily Mar 29, 2024
aa9315e
Merge pull request #29 from wenbinyugroup/task/dashan-task2
Frankemily Mar 29, 2024
46ed4f2
Merge
Mar 29, 2024
35881d1
merged4
bagla0 Mar 29, 2024
4aaa0ff
Merge pull request #33 from wenbinyugroup/task/akshat-task22
bagla0 Mar 29, 2024
13997b5
Merge branch 'develop' into task/haodong-task2
duhd1993 Mar 29, 2024
b17df49
Merge pull request #34 from wenbinyugroup/task/haodong-task2
duhd1993 Mar 29, 2024
9cbff12
add BugFile.txt
unitasium Apr 5, 2024
d3fa004
bugfile for workshop 3
wenbinyu-PU Apr 5, 2024
a426725
BugFile
bagla0 Apr 5, 2024
3d56f2c
fix bugfile
unitasium Apr 5, 2024
d61e2d5
delete bugfile for workshop 3
wenbinyu-PU Apr 5, 2024
a5bb0f0
NewBug
bagla0 Apr 5, 2024
ed52ec0
Merge pull request #36 from wenbinyugroup/task/su-task3
unitasium Apr 5, 2024
15e7795
Merge pull request #35 from wenbinyugroup/task/wenbin-task3
wenbinyu-PU Apr 5, 2024
29643ff
Merge pull request #38 from wenbinyugroup/task/akshat-task3
bagla0 Apr 5, 2024
ad043b3
add BugFile.txt (#37)
banghuazhao Apr 5, 2024
dc419ea
prepare-2.0 (#40)
banghuazhao Apr 5, 2024
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
Empty file added BugFile1.txt
Empty file.
Empty file added New Text Document.txt
Empty file.
Empty file added NotBugFile.txt
Empty file.
18 changes: 16 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# GitBranchingDemo

Release version: 1.0.2 (2024030102)
Release version: 2.0 (2024040601)


Update README 2024022702 Akshat


Update README 20240329 Dashan Zhang


Update README su-task2

Update README 2024022702 Wenbin Yu 1


Update README 2024022702 Banghua


Update README 2024022702
5 changes: 5 additions & 0 deletions banghua_task1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# GitBranchingDemo

Release version: 1.0.2 (2024030102)

Update README 2024022702
Empty file added git
Empty file.
Empty file added su_task1.txt
Empty file.
Empty file added test
Empty file.
Empty file added test.txt
Empty file.
1 change: 1 addition & 0 deletions touch BugFile11.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
akshat task3
1 change: 1 addition & 0 deletions wenbin_task1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
It is my test file.
Loading