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
- Kirjanpito
- Varastointi
- PoS
- Project
- MRP
Tämä kysymys on merkitty
4
Vastaukset
29138
Näkymät
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
Nautitko keskustelusta? Älä vain lue, vaan osallistu!
Luo tili jo tänään nauttiaksesi yksinoikeusominaisuuksista ja osallistuaksesi mahtavaan yhteisöömme!
Rekisteröidy| Aiheeseen liittyviä artikkeleita | Vastaukset | Näkymät | Toimenpide | |
|---|---|---|---|---|
|
Call a method while upgrading a module
Ratkaistu
|
|
2
marrask. 23
|
9149 | |
|
0
heinäk. 20
|
3247 | ||
|
1
kesäk. 23
|
2641 | ||
|
3
helmik. 22
|
11324 | ||
|
1
toukok. 21
|
5036 |
How many branches in git do you have?
Have two branch, staging and master.
Did you use Rebase & merge or merge?