Skip to content

Explain how to use git efficiently in PRs #12

@Guillemdb

Description

@Guillemdb

@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.

Metadata

Metadata

Assignees

Labels

High priorityThis should be resolved ASAPblockingThis is blocking our progressenhancementNew feature or requesttutorialThis involves a tutorial in the guide / project docs

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions