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
- Contabilità
- Magazzino
- PoS
- Project
- MRP
La domanda è stata contrassegnata
4
Risposte
28905
Visualizzazioni
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
Ti stai godendo la conversazione? Non leggere soltanto, partecipa anche tu!
Crea un account oggi per scoprire funzionalità esclusive ed entrare a far parte della nostra fantastica community!
Registrati| Post correlati | Risposte | Visualizzazioni | Attività | |
|---|---|---|---|---|
|
2
nov 23
|
8857 | ||
|
0
lug 20
|
3024 | ||
|
1
giu 23
|
2455 | ||
|
3
feb 22
|
11105 | ||
|
1
mag 21
|
4861 |
How many branches in git do you have?
Have two branch, staging and master.
Did you use Rebase & merge or merge?