Codeberg/Documentation
42
199
Fork
You've already forked Documentation
161

Article on conflict resolution #233

Merged
fnetX merged 1 commit from :resolving-conflicts into main 2022年06月14日 21:40:06 +02:00
Contributor
Copy link

Initial version of an article on conflict resolution

Fixes: #14

Initial version of an article on conflict resolution Fixes: #14
fnetX left a comment
Copy link

I think the text/information ratio is not optimal here, but I lack ideas to optimize. But I think it's too much text that conveys few information.

After scanning the text (okay, I'm tired), I'm still confused about the basics etc. Kinda overloaded by stuff and text.

I think we should merge this in and improve later.

I think the text/information ratio is not optimal here, but I lack ideas to optimize. But I think it's too much text that conveys few information. After scanning the text (okay, I'm tired), I'm still confused about the basics etc. Kinda overloaded by stuff and text. I think we should merge this in and improve later.
@ -0,0 +10,4 @@
First of all: Do not panic! You should be able to resolve merge conflicts with a little time, Git and patience.
While it is a good idea to rebase your branch prior to creating a pull request, as described in the article on [Pull requests and Git flow](pull-requests-and-git-flow.md)
Owner
Copy link

...,

...,
fnetX added the due date 2022年06月06日 2022年06月01日 12:45:14 +02:00
Sign in to join this conversation.
No reviewers
Labels
Clear labels
Codeberg Pages
Issues affecting Codeberg Pages
Documentation Usability
Issues related to using and reading docs.codeberg.org
Forgejo
Good First Issue! 👋
Kind: Bug
Kind: Documentation
Kind: Enhancement
Kind: Feature
Kind: Question
Kind: Security
Licensing
Part: Generator
This is related to the generation of the documentation, not to the content itself
Priority: High
The priority is high
Priority: Low
The priority is low
Priority: Medium
The priority is medium
Reviewed: Confirmed
Something has been confirmed
Reviewed: Duplicate
Something exists already
Reviewed: Invalid
Something was marked as invalid
Reviewed: Wontfix
Something won't be fixed
Status: Blocked
Status: Help wanted
Contributions are welcome!
Status: In progress
Work is in progress
Status: Needs feedback
Feedback is needed
Status: Ready for Review
Work is completed
Status: Review
Review is in progress / Reviewers wanted
Status: Stale
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
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".

2022年06月06日

Dependencies

No dependencies set.

Reference
Codeberg/Documentation!233
Reference in a new issue
Codeberg/Documentation
No description provided.
Delete branch ":resolving-conflicts"

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?