matthew
/
Test-Repo
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Change file #1

Open
matthew wants to merge 5 commits from branch1 into main
pull from: branch1
merge into: matthew:main
Conversation 0 Commits 5 Files Changed 5
matthew commented 2023-02-17 18:58:39 +00:00
Owner
There is no content yet.
matthew added 1 commit 2023-02-17 18:58:39 +00:00
matthew added 1 commit 2023-02-17 19:07:34 +00:00
matthew added 1 commit 2023-02-17 19:30:55 +00:00
matthew added 1 commit 2023-02-17 19:32:14 +00:00
matthew added 1 commit 2023-02-21 21:47:51 +00:00
This pull request has changes conflicting with the target branch.
  • File.txt
  • NewFileHere.txt
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 branch1 main
git pull origin branch1

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff branch1
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
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: matthew/Test-Repo#1
There is no content yet.
Delete Branch "branch1"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?