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:
- 客户关系管理
- e-Commerce
- 会计
- 库存
- PoS
- Project
- MRP
此问题已终结
4
回复
28833
查看
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
| 相关帖文 | 回复 | 查看 | 活动 | |
|---|---|---|---|---|
|
2
11月 23
|
8786 | ||
|
0
7月 20
|
2937 | ||
|
1
6月 23
|
2396 | ||
|
3
2月 22
|
11035 | ||
|
1
5月 21
|
4800 |
How many branches in git do you have?
Have two branch, staging and master.
Did you use Rebase & merge or merge?