Skip to Content
Menu
This question has been flagged
4 Replies
28846 Rodiniai

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 ?

Portretas
Atmesti

How many branches in git do you have?

Autorius

Have two branch, staging and master.

Did you use Rebase & merge or merge?

Best Answer

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

Portretas
Atmesti
Related Posts Replies Rodiniai Veikla
2
lapkr. 23
8797
0
liep. 20
2944
1
birž. 23
2398
3
vas. 22
11042
1
geg. 21
4805