Skip to Content
Menu
This question has been flagged
4 Replies
29112 Zobrazenia

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 ?

Avatar
Zrušiť

How many branches in git do you have?

Autor

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

Avatar
Zrušiť
Related Posts Replies Zobrazenia Aktivita
2
nov 23
9112
0
júl 20
3233
1
jún 23
2600
3
feb 22
11303
1
máj 21
5023