innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

上传及下载 #2

Open
innov wants to merge 39 commits from stable/0.91.x into stable/1.0.x
pull from: stable/0.91.x
merge into: innov:stable/1.0.x
Conversation 0 Commits 39 Files Changed 18 +334 -168
innov commented 2022-11-01 09:20:52 +08:00
Owner
Copy Link

![](/api/attachments/4351)
innov added 39 commits 2022-11-01 09:20:55 +08:00
This pull request has changes conflicting with the target branch.
  • django/contrib/admin/templates/admin/login.html
  • django/contrib/admin/views/main.py
  • django/core/handlers/base.py
  • README
  • django/contrib/admin/media/js/admin/RelatedObjectLookups.js
  • django/contrib/admin/views/decorators.py
  • django/contrib/comments/feeds.py
  • django/contrib/comments/views/comments.py
  • django/__init__.py
  • django/bin/compile-messages.py
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 stable/0.91.x stable/1.0.x
git pull origin stable/0.91.x

Step 2:

Merge the changes and update on Gitea.
git checkout stable/1.0.x
git merge --no-ff stable/0.91.x
git push origin stable/1.0.x
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: innov/django1#2
No description provided.
Delete Branch "stable/0.91.x"

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?