charles/test_git
0
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

branche1 #1

Open
charles wants to merge 3 commits from branche1 into main
pull from: branche1
merge into: charles:main
Conversation 0 Commits 3 Files changed 2 +26 -1
charles commented 2025-07-18 10:43:40 +01:00
Owner
Copy link

test

test
This pull request has changes conflicting with the target branch.
  • README.md
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin branche1:branche1
git switch branche1

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff branche1
git switch branche1
git rebase main
git switch main
git merge --ff-only branche1
git switch branche1
git rebase main
git switch main
git merge --no-ff branche1
git switch main
git merge --squash branche1
git switch main
git merge --ff-only branche1
git switch main
git merge branche1
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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
charles/test_git!1
No description provided.