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
- Accounting
- Inventory
- PoS
- Project management
- MRP
This question has been flagged
4
Replies
27493
Views
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
Enjoying the discussion? Don't just read, join in!
Create an account today to enjoy exclusive features and engage with our awesome community!
Sign up| Related Posts | Replies | Views | Activity | |
|---|---|---|---|---|
|
2
Nov 23
|
7324 | ||
|
0
Jul 20
|
2040 | ||
|
1
Jun 23
|
1536 | ||
|
3
Feb 22
|
9720 | ||
|
1
May 21
|
3805 |
How many branches in git do you have?
Have two branch, staging and master.
Did you use Rebase & merge or merge?