-
Tested with:
- Running backport locally:
Merge conflict => Fix locally before it is pushed & PR created
- Running backport via Github action:
Merge conflict
=> Creates a PR for the branches that…
-
Whenever there are multiple PRs for adding packages, after the first one is merged there is a merge conflict.
This is kind of silly and we should be able to fix it. Here are a couple of solutions:
…
-
Squash-merging within stacks can lead to phantom merge conflicts. To prevent them:
1. before shipping: synchronize all descendents of the branch to ship
2. after shipping: sync all these branches …
-
Hi, every now and then it comes to the situation (especially when I rebase ancient branches) that I find myself in the position of having to resolve merge conflicts for a lot of files, and I know alr…
-
## Expected Behavior
PR shouldn't be merged when PR has no reviews or if assignee is trying to merge it.
## Actual Behavior
PR was getting merged
## Steps to Reproduce the Problem
1. We h…
-
There has been a lot of branches created for this repos. Which is creating a lot of merge conflicts.
-
## Issue Overview
Need to sync `hooks-example-v3` with the v3 version which is located at `main`.
## Proposed Solutions or Ideas
- Merge or rebase (recommended to merge).
- Resolve any confl…
-
### Describe the project you are working on
This applies to all projects on which you work together with others.
I see this problem every game jam.
### Describe the problem or limitation you are ha…
-
# Submissão do Exercício 6: Merge Conflicts
Este espaço é dedicado à submissão e discussão do Exercício 6, onde você praticou como resolver conflitos de merge no Git.
## Instruções de Submissão
…
-
**Pre-requist tasks**
- [x] My device drivers are up to date.
- [x] The [troublemaking solutions](https://github.com/clEsperanto/pyclesperanto?tab=readme-ov-file#troubleshooting-graphics-cards-drive…