wang/pull-request-conflict
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

modify something #1

Open
wang wants to merge 1 commit from check-if-conflict into main
pull from: check-if-conflict
merge into: wang:main
Conversation 0 Commits 1 Files changed 1 +4 -1
wang commented 2024-02-26 21:18:02 +00:00
Owner
Copy link
No description provided.
wang added 1 commit 2024-02-26 21:18:02 +00:00
wang was assigned by earl-warren 2024-02-27 12:32:34 +00:00
jougs reviewed 2024-03-03 08:02:51 +00:00
opscore-utility-process.js
@ -470,10 +470,13 @@ class UtilityServerStub {
* the name of the addXML specific function
*/
dumpXML(args) {
const xmlDumper = new this.mod.datastore.XMLDumper(this.mod.writer);
jougs commented 2024-03-03 08:02:51 +00:00
First-time contributor
Copy link

Test review

Test review
This pull request has changes conflicting with the target branch.
  • opscore-utility-process.js
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff check-if-conflict
git checkout main
git merge --ff-only check-if-conflict
git checkout check-if-conflict
git rebase main
git checkout main
git merge --no-ff check-if-conflict
git checkout main
git merge --squash check-if-conflict
git checkout main
git merge --ff-only check-if-conflict
git checkout main
git merge check-if-conflict
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
wang
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: wang/pull-request-conflict#1
No description provided.
Delete branch "check-if-conflict"

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?