Hi
When i try to merge the staging to master in SH , I got this error,
"Pull request Already exist for XXX : staging"
Does anyone know what is the issue ?
Odoo is the world's easiest all-in-one management software.
It includes hundreds of business apps:
- CRM
- e-Commerce
- Buchhaltung
- Lager
- PoS
- Project
- MRP
Diese Frage wurde gekennzeichnet
4
Antworten
29168
Ansichten
Hi,
This issue is because of the conflict between the master branch and staging branch.You can see the files which have conflicts from the GitHub itself and it can be resolved by deciding which code is to kept(either master or staging) from the GitHub.After resolving all conflicts you can merge successfully.
Hope it helps
Diskutieren Sie gerne? Treten Sie bei, statt nur zu lesen!
Erstellen Sie heute ein Konto, um exklusive Funktionen zu nutzen und mit unserer tollen Community zu interagieren!
Registrieren| Verknüpfte Beiträge | Antworten | Ansichten | Aktivität | |
|---|---|---|---|---|
|
2
Nov. 23
|
9158 | ||
|
0
Juli 20
|
3258 | ||
|
1
Juni 23
|
2662 | ||
|
3
Feb. 22
|
11356 | ||
|
1
Mai 21
|
5044 |
How many branches in git do you have?
Have two branch, staging and master.
Did you use Rebase & merge or merge?