-
Notifications
You must be signed in to change notification settings - Fork 2
Open
Labels
High priorityThis should be resolved ASAPThis should be resolved ASAPblockingThis is blocking our progressThis is blocking our progressenhancementNew feature or requestNew feature or requesttutorialThis involves a tutorial in the guide / project docsThis involves a tutorial in the guide / project docs
Description
@VicenteAR Asked about avoiding merge conflicts in PRs, and that is a topic that deserves its own tutorial.
We need to add a section about using git efficiently to avoid duplicated commits and merge conflicts in Pull requests. The new section will cover the following cases:
- Avoiding and resolving merge conflicts
- Cascading PRs that depend on each other
- Updating changes pushed to master after the PR was opened.
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
High priorityThis should be resolved ASAPThis should be resolved ASAPblockingThis is blocking our progressThis is blocking our progressenhancementNew feature or requestNew feature or requesttutorialThis involves a tutorial in the guide / project docsThis involves a tutorial in the guide / project docs