Labels Milestones

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

mjev3fkmu commented 6 months ago

Owner

branch2修改

branch2修改

mjev3fkmu added 1 commit 6 months ago

f5a74fc790 branch2修改

mjev3fkmu added 6 commits 6 months ago

72034b0e7d 使用branch1分支提交

98d5f0b5a4 branch1 ...

确认合并

e9022edc1a 提交hello222

3ac2a4579b Merge branch 'main' of https://bdgit.educoder.net/mjev3fkmu/git_test_lyy

4fb1465acd develop分支提交

d5ae4e47b9 Merge branch 'develop' of https://bdgit.educoder.net/mjev3fkmu/git_test_lyy into branch2 ...

# Conflicts:
#	hello.txt

mjev3fkmu added 1 commit 6 months ago

3319d3cdf9 修改branch2

mjev3fkmu added 3 commits 6 months ago

fc762bf06f 修改branch2

e538924ad9 Merge branch 'branch2' of https://bdgit.educoder.net/mjev3fkmu/git_test_lyy into branch2

22a0ddc20e 修改branch2中的hello.txt

mjev3fkmu added 1 commit 6 months ago

f6af7125a5 修改branch2

This pull request can be merged automatically.

You are not authorized to merge this pull request.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: mjev3fkmu/git_test_lyy#2

Write Preview

Loading…

Cancel

Save

There is no content yet.