Logo
Explore Help
Sign In
mjev3fkmu
/
git_test_lyy
1
0
Fork
You've already forked git_test_lyy
0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

branch2请求合并-应该产生冲突 #2

Open
mjev3fkmu wants to merge 8 commits from branch2 into main
pull from: branch2
merge into: mjev3fkmu:main
mjev3fkmu:develop
mjev3fkmu:branch1
mjev3fkmu:branch3
mjev3fkmu:main
Conversation 0 Commits 8 Files Changed 2

8 Commits (main)

Author SHA1 Message Date
Luoyuanyuan f6af7125a5 修改branch2
1 year ago
Luoyuanyuan 22a0ddc20e 修改branch2中的hello.txt
1 year ago
Luoyuanyuan e538924ad9 Merge branch 'branch2' of https://bdgit.educoder.net/mjev3fkmu/git_test_lyy into branch2
1 year ago
Luoyuanyuan fc762bf06f 修改branch2
1 year ago
Luoyuanyuan 3319d3cdf9 修改branch2
1 year ago
Luoyuanyuan d5ae4e47b9 Merge branch 'develop' of https://bdgit.educoder.net/mjev3fkmu/git_test_lyy into branch2
# Conflicts:
#	hello.txt
1 year ago
Luoyuanyuan 4fb1465acd develop分支提交
1 year ago
Luoyuanyuan f5a74fc790 branch2修改
1 year ago
Powered by Gitea Version: development Page: 198ms Template: 2ms
English
Bahasa Indonesia Deutsch English Español Français Italiano Latviešu Magyar nyelv Nederlands Polski Português de Portugal Português do Brasil Suomi Svenska Türkçe Čeština Ελληνικά Български Русский Українська فارسی മലയാളം 日本語 简体中文 繁體中文(台灣) 繁體中文(香港) 한국어
Licenses API