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 ?
Dette spørgsmål er blevet anmeldt
4
Besvarelser
30983
Visninger
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
Kan du lide at diskutere? Læs ikke bare med, deltag aktivt i debatten!
Opret en konto i dag for at få glæde af eksklusive funktioner, og bliv en del af vores skønne fællesskab!
Tilmeld dig| Relaterede indlæg | Besvarelser | Visninger | Aktivitet | |
|---|---|---|---|---|
|
2
nov. 23
|
11653 | ||
|
0
jul. 20
|
4978 | ||
|
1
jun. 23
|
4099 | ||
|
3
feb. 22
|
13208 | ||
|
1
maj 21
|
6992 |
How many branches in git do you have?
Have two branch, staging and master.
Did you use Rebase & merge or merge?