schrottkatze/strath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolved Shitty Conflict Resolution #5

Merged
schrottkatze merged 0 commits from github/fork/Ihre-Kaiserliche-Hoheit/main into main 2021-12-16 10:53:05 +00:00
Conversation 1 Commits - Files changed -
schrottkatze commented 2021-12-16 10:51:42 +00:00 (Migrated from gitlab.com)
Copy link

Created by: Ihre-Kaiserliche-Hoheit

@obsidianical learn how to properly merge conflicting commits, you disgrace of a git user

*Created by: Ihre-Kaiserliche-Hoheit* @obsidianical learn how to properly merge conflicting commits, you disgrace of a git user
schrottkatze commented 2021-12-16 10:53:05 +00:00 (Migrated from gitlab.com)
Copy link

Merged by: obsidianical at 2021-12-16 10:53:05 UTC

*Merged by: obsidianical at 2021-12-16 10:53:05 UTC*
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
documentation

   
duplicate

   
enhancement

   
good first issue

   
help wanted

   
invalid

   
question

   
wontfix
No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
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: schrottkatze/strath#5
No description provided.
Delete branch "github/fork/Ihre-Kaiserliche-Hoheit/main"

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?