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 ?
Denna fråga har flaggats
4
Svar
30973
Vyer
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
Njuter du av diskussionen? Läs inte bara, delta också!
Skapa ett konto idag för att ta del av exklusiva funktioner och engagera dig i vår fantastiska community!
Registrera dig| Relaterade inlägg | Svar | Vyer | Verksamhet | |
|---|---|---|---|---|
|
2
nov. 23
|
11635 | ||
|
0
juli 20
|
4961 | ||
|
1
juni 23
|
4087 | ||
|
3
feb. 22
|
13205 | ||
|
1
maj 21
|
6984 |
How many branches in git do you have?
Have two branch, staging and master.
Did you use Rebase & merge or merge?