UNN/2026-rff_mp
16
14
Fork 113
Code Issues Pull Requests 15 Actions Packages Projects Releases Wiki Activity

[1] structure_data #159

Open
IvantsovMA wants to merge 8 commits from IvantsovMA/2026-rff_mp:ivantsovma into develop
pull from: IvantsovMA/2026-rff_mp:ivantsovma
merge into: UNN:develop
Conversation 1 Commits 8 Files Changed 11 +722 -1
IvantsovMA commented 2026-03-21 12:44:24 +00:00
Contributor
Copy Link
No description provided.
IvantsovMA added 8 commits 2026-03-21 12:44:25 +00:00
git_admin commented 2026-04-27 18:04:38 +00:00
Owner
Copy Link

Убери из пулл-реквеста измененный мой базовый файл readme.md корневой папки. Не могу принять запрос с конфликтом.

Убери из пулл-реквеста измененный мой базовый файл readme.md корневой папки. Не могу принять запрос с конфликтом.
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 ivantsovma:IvantsovMA-ivantsovma
git checkout IvantsovMA-ivantsovma

Merge

Merge the changes and update on Gitea.
git checkout develop
git merge --no-ff IvantsovMA-ivantsovma
git checkout develop
git merge --ff-only IvantsovMA-ivantsovma
git checkout IvantsovMA-ivantsovma
git rebase develop
git checkout develop
git merge --no-ff IvantsovMA-ivantsovma
git checkout develop
git merge --squash IvantsovMA-ivantsovma
git checkout develop
git merge --ff-only IvantsovMA-ivantsovma
git checkout develop
git merge IvantsovMA-ivantsovma
git push origin develop
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
2 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: UNN/2026-rff_mp#159
No description provided.
Delete Branch "IvantsovMA/2026-rff_mp:ivantsovma"

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?