collarbone-annihilation/iu9-ca-web-chat
7
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 1 Wiki Activity

master #6

Open
karimov-adel wants to merge 39 commits from master into adel_branch_2.0
pull from: master
merge into: collarbone-annihilation:adel_branch_2.0
Conversation 0 Commits 39 Files Changed 97 +4021 -1733
karimov-adel commented 2024-09-12 16:19:42 +00:00
Member
Copy Link
No description provided.
karimov-adel added 35 commits 2024-09-12 16:19:42 +00:00 
To pull all the images
Reviewed-on: #5
yakovlev-anton added 4 commits 2024-09-14 00:59:07 +00:00
This pull request has changes conflicting with the target branch.
  • assets/HypertextPages/chat.nytl.html
  • assets/css/chat.css
  • assets/css/login.css
  • assets/js/chat.js
View command line instructions.

Checkout

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

Merge

Merge the changes and update on Gitea.
git checkout adel_branch_2.0
git merge --no-ff master
git checkout adel_branch_2.0
git merge --ff-only master
git checkout master
git rebase adel_branch_2.0
git checkout adel_branch_2.0
git merge --no-ff master
git checkout adel_branch_2.0
git merge --squash master
git checkout adel_branch_2.0
git merge --ff-only master
git checkout adel_branch_2.0
git merge master
git push origin adel_branch_2.0
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: collarbone-annihilation/iu9-ca-web-chat#6
No description provided.
Delete Branch "master"

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?