Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Explain how to use git efficiently in PRs #12

Open
Guillemdb opened this issue Feb 12, 2021 · 0 comments
Open

Explain how to use git efficiently in PRs #12

Guillemdb opened this issue Feb 12, 2021 · 0 comments
Assignees
@Guillemdb
Labels
blocking This is blocking our progress enhancement New feature or request High priority This should be resolved ASAP tutorial This involves a tutorial in the guide / project docs

Comments

@Guillemdb
Copy link
Member

@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.
@Guillemdb Guillemdb self-assigned this Feb 12, 2021
@Guillemdb Guillemdb added enhancement New feature or request tutorial This involves a tutorial in the guide / project docs blocking This is blocking our progress High priority This should be resolved ASAP labels Feb 12, 2021
@Guillemdb Guillemdb mentioned this issue Feb 12, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@Guillemdb Guillemdb

Labels
blocking This is blocking our progress enhancement New feature or request High priority This should be resolved ASAP tutorial This involves a tutorial in the guide / project docs
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@Guillemdb