egor.rutkowski
/
MNP_Projekt_2
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

detached #1

Open
egor.rutkowski wants to merge 2 commits from detached into main
pull from: detached
merge into: egor.rutkowski:main
Conversation 0 Commits 2 Files Changed 4 +314 -282
egor.rutkowski commented 2024-07-02 21:40:05 +02:00
Owner
Copy Link
No description provided.
egor.rutkowski added 2 commits 2024-07-02 21:40:06 +02:00
This pull request has changes conflicting with the target branch.
  • src/main/java/com/example/Actor.java
  • src/main/java/com/example/PrintAndEvaluate.java
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 detached main
git pull origin detached

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff detached
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: egor.rutkowski/MNP_Projekt_2#1
No description provided.
Delete Branch "detached"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?