geimist/synOTR
geimist/synOTR
1
1
Fork 1
Code Issues 20 Pull requests 2 Releases 8 Wiki Activity

„Pack/INFO“ ändern #28

Open
geimist wants to merge 47 commits from DSM7_dev into master
pull from: DSM7_dev
merge into: geimist:master
Conversation 0 Commits 47 Files changed 134 +511 -195
geimist commented 2021-06-26 20:54:37 +00:00
Owner
Copy link
No description provided.
geimist added 1 commit 2021-06-26 20:54:38 +00:00
geimist added 1 commit 2021-06-29 16:08:58 +00:00
geimist added 1 commit 2021-06-29 18:32:31 +00:00
geimist added 1 commit 2021-07-03 11:49:48 +00:00
geimist added 1 commit 2021-07-03 12:05:58 +00:00
geimist added 1 commit 2021-07-03 12:06:45 +00:00
geimist added 1 commit 2021-07-03 12:08:32 +00:00
geimist added 1 commit 2021-07-03 13:10:52 +00:00
geimist added 1 commit 2021-07-03 13:11:33 +00:00
geimist added 1 commit 2021-07-03 13:11:41 +00:00
geimist added 1 commit 2021-07-03 13:19:52 +00:00
geimist added 1 commit 2021-07-03 13:21:18 +00:00
geimist added 1 commit 2021-07-03 13:41:06 +00:00
geimist added 1 commit 2021-07-03 14:15:11 +00:00
geimist added 1 commit 2021-07-03 14:32:48 +00:00
geimist added 1 commit 2021-07-03 14:38:59 +00:00
geimist added 1 commit 2021-07-03 14:41:13 +00:00
geimist added 1 commit 2021-07-03 14:42:39 +00:00
geimist added 1 commit 2021-07-03 14:44:07 +00:00
geimist added 1 commit 2021-07-03 14:45:03 +00:00
geimist added 1 commit 2021-07-03 14:45:45 +00:00
geimist added 1 commit 2021-07-03 14:48:22 +00:00
geimist added 1 commit 2021-07-03 15:23:40 +00:00
geimist added 1 commit 2021-07-03 15:34:29 +00:00
geimist added 1 commit 2021-07-03 16:28:46 +00:00
geimist added 1 commit 2021-07-03 16:28:57 +00:00
geimist added 1 commit 2021-07-03 17:18:16 +00:00
geimist added 1 commit 2021-07-03 17:23:04 +00:00
geimist added 1 commit 2021-07-04 15:25:49 +00:00
geimist added 1 commit 2021-07-04 15:26:31 +00:00
geimist added 1 commit 2021-07-04 15:35:27 +00:00
geimist added 1 commit 2021-07-04 15:46:50 +00:00
geimist added 1 commit 2021-07-04 17:07:49 +00:00
geimist added 1 commit 2021-07-04 17:40:57 +00:00
geimist added 1 commit 2021-07-04 19:05:29 +00:00
geimist added 1 commit 2021-07-07 16:23:25 +00:00
geimist added 1 commit 2021-07-08 13:01:29 +00:00
geimist added 1 commit 2021-08-07 08:44:22 +00:00
geimist added 1 commit 2021-10-18 12:05:02 +00:00
geimist added 1 commit 2021-10-19 14:18:16 +00:00
geimist added 1 commit 2023-06-11 11:11:54 +00:00
geimist added 1 commit 2023-06-11 11:13:32 +00:00
geimist added 1 commit 2023-06-11 11:15:40 +00:00
geimist added 1 commit 2023-06-11 11:15:57 +00:00
geimist added 1 commit 2023-08-18 14:22:48 +00:00
geimist added 1 commit 2023-08-18 14:33:23 +00:00
geimist added 1 commit 2023-08-18 14:35:45 +00:00
This pull request has changes conflicting with the target branch.
  • Build/synOTR.sh
  • Pack/CHANGELOG
  • Pack/INFO
View command line instructions.

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff DSM7_dev
git checkout master
git merge --ff-only DSM7_dev
git checkout DSM7_dev
git rebase master
git checkout master
git merge --no-ff DSM7_dev
git checkout master
git merge --squash DSM7_dev
git checkout master
git merge --ff-only DSM7_dev
git checkout master
git merge DSM7_dev
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
GUI

Issue betrifft GUI

  
SHELL

Issue betrifft Skripte und Arbeitsabläufe

  
SPK

Issue betrifft die Systemintegration in DSM

  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
help wanted

Need some help

  
improvement

New small feature

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
GUI
SHELL
SPK
bug
duplicate
feature
help wanted
improvement
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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: geimist/synOTR#28
No description provided.
Delete branch "DSM7_dev"

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?