conflict files #13

Open

jasder wants to merge 66 commits from master into dev_ceshi

pull from: master

merge into: jasder:dev_ceshi

jasder:develop

jasder:new

jasder:wearclother

jasder:dddd-03

jasder:dddd-02

jasder:dddd-01

jasder:future/fff/fff

jasder:er/kdf/ddd

jasder:again/jikk

jasder:hh/sdfoiwe

jasder:u/f/hhh

jasder:update/file/commit

jasder:update/has/edit

jasder:has/zifu

jasder:sdke/fursff

jasder:dev_html_newhtml_newnewnew

jasder:cccc_ccc

jasder:gggg

jasder:ccc

jasder:cd

jasder:dev_jjj

jasder:dev_ceshi

Conversation 0 Commits 66 Files Changed 10 +73 -4

jasder commented 2021-06-24 16:27:58 +08:00

Owner

Copy Link

不不不不

不不不不

jasder added 65 commits 2021-06-24 16:27:59 +08:00

d78b65fff1 add devops file

63f725a31d fix devops

dd679e1ba9 ADD file for test devops

a530ab3559 Delete file for test devops

77c009c747 fsfs

afca322c22 fsfsfff

745951024c 更新 '.trustie-pipeline.yml'

3387836435 更新 '.trustie-pipeline.yml'

07c92153a4 更新 '.trustie-pipeline.yml'

4ab94fc894 更新 '.trustie-pipeline.yml'

5294e9cdfc 更新 '.trustie-pipeline.yml'

e4c22f4836 更新 '.trustie-pipeline.yml'

aea73431af update .trustie-pipeline.yml

d1090dc9bf update .trustie-pipeline.yml

7e275ca9b4 更新 '.trustie-pipeline.yml'

8d7916b329 FIX test webhook

bbb4a1ae5c Merge branch 'master' of http://testgitea2.trustie.net/jasder/forgeplus

a2d7f1c0e9 FIX delete file

0e8d3f8787 FIX delete file

e31f9fd9f6 FIX delete file

f099e8c385 FIX add file for test gitea webhook

f8e34c88ea Fix add puts method

96cc2a85c7 更新 '.trustie-pipeline.yml'

c8c1a362e8 更新 '.trustie-pipeline.yml'

5e7c6f7dfd 更新 '.trustie-pipeline.yml'

5e52ce51a2 更新 '.trustie-pipeline.yml'

ba7f7bd89f fffffffff

2dad9dc99d Update '.trustie-pipeline.yml'

575294361a ADD a file for test devops

b08fcbd0a3 Upate file

f5311b6c0a FIX code review

2df6b66573 ADD test.rb file

50366bddf9 Merge branch 'master' of http://testgitea2.trustie.net/jasder/forgeplus

c1dca57802 cai

2d98086f0d good luck

3a2f41a456 test what

49cfa0d312 add

5a3d50a441 delete

3f8942828f c

8c40ecb096 ff

2da66d6634 test

afbe914036 test

661127106e test

dca3dd5254 Update '.trustie-pipeline.yml'

42cb21ad32 add put method

7327f4ceda 更新 '.trustie-pipeline.yml'

d9516030e6 FIX code bug

5d885d5226 delete

b111572750 add puts

afb9bb50a8 add puts method

30af0e5234 delete 'puts' method

31a85209b8 ffff

9314b3f669 FIX change markdown

adbe5d2519 f

e029b06cb4 fix md

b65975c535 ggg

6dcedf3cb3 fff

fc83612374 fa

a852764a43 Update '.trustie-pipeline.yml'

d77db8c275 fix

15d5904df9 update file

e6752308ae 添加 'caishi.html1'

617fb777e0 Add pr.html

2aea0aba15 Addnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.htmlAddnew.html

11a91d062f 修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips修改tips

jasder added 1 commit 2021-06-25 13:45:07 +08:00

3595d3e2e9 Update .trustie-pipeline.yml

jasder added the due date 2021-09-16 2021-09-16 14:25:23 +08:00

jasder self-assigned this 2021-09-16 14:25:23 +08:00

jasder modified the due date from 2021-09-16 to 2021-10-08 2021-10-08 16:30:18 +08:00

This pull request has changes conflicting with the target branch.

• caishi.html

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b master dev_ceshi

git pull origin master

Step 2:

Merge the changes and update on Gitea.

git checkout dev_ceshi

git merge --no-ff master

git push origin dev_ceshi

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

jasder

1 Participants

Notifications

Subscribe

Due Date

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

2021-10-08

Dependencies

No dependencies set.

Reference: jasder/forgeplus#13

No description provided.