GitHub Community
Merge Issue in github which i faced #151347
Replies: 25 comments 17 replies
-
|
💬 Your Product Feedback Has Been Submitted 🎉 Thank you for taking the time to share your insights with us! Your feedback is invaluable as we build a better GitHub experience for all our users. Here's what you can expect moving forward ⏩
Where to look to see what's shipping 👀
What you can do in the meantime 💻
As a member of the GitHub community, your participation is essential. While we can't promise that every suggestion will be implemented, we want to emphasize that your feedback is instrumental in guiding our decisions and priorities. Thank you once again for your contribution to making GitHub even better! We're grateful for your ongoing support and collaboration in shaping the future of our platform. ⭐ |
Beta Was this translation helpful? Give feedback.
-
|
The |
Beta Was this translation helpful? Give feedback.
-
|
In future zara also merged code with tufail and haseeb-dev branch and then
tufail merge his code into stagging branch but github does not detect any
change in Internetpage.tax. If you have some time i will show you the whole
scenario on google meet. Please ping me when you are available thanks.
Regards,
Muhammad Tufail Ali Chaudhry
…On Fri, 14 Feb 2025 at 12:58 AM, Phantom ***@***.***> wrote:
The git worked correctly. after the zara merge his branch into staging,
the commit head in staging is ahead rather than other branches. After that,
when tufail merge his branch into staging, the commit head in staging is
ahead than tufail for file InternetPage.tsx. so git does not raise any
issue. That's it. In this case, such the website link should be stored in
.env and each branches should have different env. Then this kind of thing
will not be happened.
—
Reply to this email directly, view it on GitHub
<#151347 (comment)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG77KLCU5FZ6LNX5LIL2PT2MRAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGIZDEMI>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
It did not help to solve issue. As zara revert her commit, the staging was still ahead than other branches, however zara merged code into tufail or haseeb-dev, so that git could not detect the change |
Beta Was this translation helpful? Give feedback.
-
|
See zara change link from devcustomer to customer then she pushed it into
her branch and then she merged it with tufail branch and tufail merge it
into staging branch then why github does not detect this as a change? As
zara changes the link ?This is weird behaviour
…On Fri, 14 Feb 2025 at 1:45 AM, Phantom ***@***.***> wrote:
In future zara also merged code with tufail and haseeb-dev branch and then
tufail merge his code into stagging branch but github does not detect any
change in Internetpage.tax.
It did not help to solve issue. the staging was still ahead than other
branches, so that git could not detect the change.
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG2WC2JYWULFAEVLFZL2PT76JAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGI3DKNA>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
You said zara revert his commit back, as I understand. right? |
Beta Was this translation helpful? Give feedback.
-
|
Yes if zara revert back changes on that file like change devcustomer to
customer and them merge it with staging branch staging branch will not
detect it as a change? And there will be devcustomer link on staging?
…On Fri, 14 Feb 2025 at 1:53 AM, Phantom ***@***.***> wrote:
You said zara revert his commit back, as I understand. right?
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG675IK33JZISZ63XZL2PUA3JAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGI3TCMI>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
Here you mean the revert is reset or not? |
Beta Was this translation helpful? Give feedback.
-
|
can you share the git log? |
Beta Was this translation helpful? Give feedback.
-
|
I am saying she did following
1) change customer to devcustomer and push to her branch and merge it with
staging
2) then after testing change devcustomer to customer and pushed it to her
branch and merge it to staging
And after merge staging still had devcustomer link why? Why in second merge
GitHub does not detect the change?
…On Fri, 14 Feb 2025 at 1:58 AM, Phantom ***@***.***> wrote:
Here you mean the revert is reset or not?
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG6JNJ4JC6X4WAQMJH32PUBONAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGI3TONY>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
After that, the staging link should be customer, Right. but it's does not. then we should doubt if the commit was really done like that. we don't have to doubt git. |
Beta Was this translation helpful? Give feedback.
-
|
Sure i will share it with you tomorrow first half. But if you can give me
time on google meet it will be very helpful for me to understand it there
is any confusion and it will be very helpful for me in future
On Fri, 14 Feb 2025 at 2:00 AM, M. Tufail Ali Chaudhary <
***@***.***> wrote:
… I am saying she did following
1) change customer to devcustomer and push to her branch and merge it with
staging
2) then after testing change devcustomer to customer and pushed it to her
branch and merge it to staging
And after merge staging still had devcustomer link why? Why in second
merge GitHub does not detect the change?
On Fri, 14 Feb 2025 at 1:58 AM, Phantom ***@***.***> wrote:
> Here you mean the revert is reset or not?
>
> —
> Reply to this email directly, view it on GitHub
> <#151347 (reply in thread)>,
> or unsubscribe
> </~https://github.com/notifications/unsubscribe-auth/ATF2OG6JNJ4JC6X4WAQMJH32PUBONAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGI3TONY>
> .
> You are receiving this because you authored the thread.Message ID:
> ***@***.***
> com>
>
|
Beta Was this translation helpful? Give feedback.
-
|
It's weird to me also. I can't help anything right now. maybe we dig into the commit history then we can get some idea, I guess |
Beta Was this translation helpful? Give feedback.
-
|
Yes let’s find out where the issue happened m. Give me suggestions what i
do?
…On Fri, 14 Feb 2025 at 2:14 AM, Phantom ***@***.***> wrote:
I am saying she did following 1) change customer to devcustomer and push
to her branch and merge it with staging 2) then after testing change
devcustomer to customer and pushed it to her branch and merge it to staging
After that, the staging link should be customer, Right. but it's does not.
then we should doubt if the commit was really done like that. we don't have
to doubt git.
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OGZ4DLXYCG6LJV7ILCT2PUDLFAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGI4TGOA>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
You should check the commit history one by one. |
Beta Was this translation helpful? Give feedback.
-
|
I will share git commit history with you tomorrow.
Thanks for your time.
Take care
…On Fri, 14 Feb 2025 at 2:15 AM, Phantom ***@***.***> wrote:
It's weird to me also. I can't help anything right now. maybe we dig into
the commit history then we can get some idea, I guess
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG4NXMCRGQQI4BB5J632PUDQBAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGI4TKMQ>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
I already did and that is why i am so confused.
…On Fri, 14 Feb 2025 at 2:16 AM, Phantom ***@***.***> wrote:
You should check the commit history one by one.
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OGZQYCUZNJQXULWI7FD2PUDUJAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGI4TMOI>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
I am attaching a video of my commit and merge history. In this video you
will see zara changed links from customer to devcustomer and then merge it
with staging and then she again changed devcustomer to customer and pushed
it into her branch then haseeb-search merged his code into staging and his
code already had customer link whereas while merge it is not detected as a
change and staging still had devcustomer link.
Please tell me why this happened and what
github issue (1).mp4
<https://drive.google.com/file/d/1U8npeFNciyDXU_C4VLeJ2hciPylOvBy3/view?usp=drive_web>
was the issue.
On Fri, 14 Feb 2025 at 02:17, M. Tufail Ali Chaudhary <
***@***.***> wrote:
… I already did and that is why i am so confused.
On Fri, 14 Feb 2025 at 2:16 AM, Phantom ***@***.***> wrote:
> You should check the commit history one by one.
>
> —
> Reply to this email directly, view it on GitHub
> <#151347 (reply in thread)>,
> or unsubscribe
> </~https://github.com/notifications/unsubscribe-auth/ATF2OGZQYCUZNJQXULWI7FD2PUDUJAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGI4TMOI>
> .
> You are receiving this because you authored the thread.Message ID:
> ***@***.***
> com>
>
|
Beta Was this translation helpful? Give feedback.
-
|
Sorry the video was removed you can access the video using following link
https://drive.google.com/file/d/1JmH3rovi-2tT4JgR9A4fZE-mS86HN3MR/view?usp=sharing
Sorry for the inconvenience.
On Fri, 14 Feb 2025 at 10:11, M. Tufail Ali Chaudhary <
***@***.***> wrote:
… I am attaching a video of my commit and merge history. In this video you
will see zara changed links from customer to devcustomer and then merge it
with staging and then she again changed devcustomer to customer and pushed
it into her branch then haseeb-search merged his code into staging and his
code already had customer link whereas while merge it is not detected as a
change and staging still had devcustomer link.
Please tell me why this happened and what
github issue (1).mp4
<https://drive.google.com/file/d/1U8npeFNciyDXU_C4VLeJ2hciPylOvBy3/view?usp=drive_web>
was the issue.
On Fri, 14 Feb 2025 at 02:17, M. Tufail Ali Chaudhary <
***@***.***> wrote:
> I already did and that is why i am so confused.
> On Fri, 14 Feb 2025 at 2:16 AM, Phantom ***@***.***> wrote:
>
>> You should check the commit history one by one.
>>
>> —
>> Reply to this email directly, view it on GitHub
>> <#151347 (reply in thread)>,
>> or unsubscribe
>> </~https://github.com/notifications/unsubscribe-auth/ATF2OGZQYCUZNJQXULWI7FD2PUDUJAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMJZGI4TMOI>
>> .
>> You are receiving this because you authored the thread.Message ID:
>> ***@***.***
>> com>
>>
>
|
Beta Was this translation helpful? Give feedback.
-
|
GitHub might have skipped recognizing the link change due to the previous revert, treating it as an identical change. You could try checking the commit history more closely to ensure that the reversion was properly recorded. Another possibility is that there was a merge conflict that wasn't detected or resolved correctly, leading to the old dev link making it to production. By the way if you are film lover then check freecine app |
Beta Was this translation helpful? Give feedback.
-
|
But the issue is that in future i did merge many time from different
branches like from tufail branch into staging branch. When this issue was
detected i again did merge from tufail to staging branch but it still does
not detect this as a change but when i simply added a space in file
home-internet it started detecting it as a change and change devcustomer to
customer. It will be very helpful if you can arrange meeting with me. I am
very worried about it and have so many concerns now related to github.
Thanks
Regards,
Muhammad Tufail Ali
…On Mon, 17 Feb 2025 at 10:56 AM, gulfam3257 ***@***.***> wrote:
GitHub might have skipped recognizing the link change due to the previous
revert, treating it as an identical change. You could try checking the
commit history more closely to ensure that the reversion was properly
recorded. Another possibility is that there was a merge conflict that
wasn't detected or resolved correctly, leading to the old dev link making
it to production. freecine app <https://freecineapp.live>
—
Reply to this email directly, view it on GitHub
<#151347 (comment)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG4FNVKUHLLQK6KLHY32QF2X7AVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRSGAZTOMQ>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
Can you please update on this
On Mon, 17 Feb 2025 at 11:24 AM, M. Tufail Ali Chaudhary <
***@***.***> wrote:
… But the issue is that in future i did merge many time from different
branches like from tufail branch into staging branch. When this issue was
detected i again did merge from tufail to staging branch but it still does
not detect this as a change but when i simply added a space in file
home-internet it started detecting it as a change and change devcustomer to
customer. It will be very helpful if you can arrange meeting with me. I am
very worried about it and have so many concerns now related to github.
Thanks
Regards,
Muhammad Tufail Ali
On Mon, 17 Feb 2025 at 10:56 AM, gulfam3257 ***@***.***>
wrote:
> GitHub might have skipped recognizing the link change due to the previous
> revert, treating it as an identical change. You could try checking the
> commit history more closely to ensure that the reversion was properly
> recorded. Another possibility is that there was a merge conflict that
> wasn't detected or resolved correctly, leading to the old dev link making
> it to production. freecine app <https://freecineapp.live>
>
> —
> Reply to this email directly, view it on GitHub
> <#151347 (comment)>,
> or unsubscribe
> </~https://github.com/notifications/unsubscribe-auth/ATF2OG4FNVKUHLLQK6KLHY32QF2X7AVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRSGAZTOMQ>
> .
> You are receiving this because you authored the thread.Message ID:
> ***@***.***
> com>
>
|
Beta Was this translation helpful? Give feedback.
-
|
I checked the video and I suggest you to dig into this branch carefully: |
Beta Was this translation helpful? Give feedback.
-
|
I recreated the issue.
I created a repository named *testing* and added a file named
*internetPage.tsx*, where I pasted the same code.
Then, I created four new branches:
- *staging*
-
*zara haseeb tufail*
Next, I switched to the *zara* branch, changed *customer* to *devcustomer*,
and pushed the code to the *zara* branch. After that, I merged the *zara*
branch into the *staging* branch.
Later, I changed *devcustomer* back to *customer* in the *zara* branch and
pushed the changes.
However, when I created a pull request from *haseeb* to *staging*, no
changes were detected, even though *haseeb* contains *customer.nayatel.com
<http://customer.nayatel.com>* and *staging* has *devcustomer.nayatel.com
<http://devcustomer.nayatel.com>*.
Why did this issue occur? This seems like very weird behavior. Could you
explain why this happened and how I can prevent it in the future?
I am also attaching the video.
issue recreated.mp4
<https://drive.google.com/file/d/1yI7PvSwJ_ghiJxLA-Nejkshn4SwaFxKl/view?usp=drive_web>
…On Wed, 19 Feb 2025 at 04:25, Phantom ***@***.***> wrote:
I checked the video and I suggest you to dig into this branch carefully:
haseeb-dev
image.png (view on web)
</~https://github.com/user-attachments/assets/84f7de9f-4516-406d-bc40-6cd7bad12d9b>
Here the commit message was weird for internetpage.tsx file
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG6CRDHKDKVHK74CPE32QO6M7AVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRUGMZDKMY>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
As I said before, we don't have to doubt git. I checked your new video and staging has 2 commits ahead rather than haseeb. At this point, when you raise PR from haseeb into staging, there is no comparison. |
Beta Was this translation helpful? Give feedback.
-
|
You are just playing on Github now but I recommend you to use Gitkraken or Github desktop to analyze the history. |
Beta Was this translation helpful? Give feedback.
-
|
Why GitHub thinks there is no change as haseeb has customer link and
staging branch has devcustomer why github does not detect this as a change.
Even staging is ahead of haseeb but there is still a line change in haseeb
branch GitHub should detect this change
…On Wed, 19 Feb 2025, 1:51 pm Phantom, ***@***.***> wrote:
You are just playing on Github now but I recommend you to use Gitkraken or
Github desktop to analyze the history.
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG7AILRK2SUV2DYNFSD2QRAXNAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRUG4YTSNA>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
That's how git works. It means, the haseeb branch is kinda old rather than staging. There is no updates on haseeb against the staging. |
Beta Was this translation helpful? Give feedback.
-
|
If you invite me, I can analyse the git history carefully. Anyway, you need to dig into it one by one among all branches. |
Beta Was this translation helpful? Give feedback.
-
|
Can you share your github user name? So i can add you
…On Thu, 20 Feb 2025 at 9:01 AM, Phantom ***@***.***> wrote:
If you invite me, I can analyse the git history carefully. Anyway, you
need to dig into it one by one among all branches.
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OGZRGG6FP73A7LGNSLD2QVHSZAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRVG44DAMQ>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
phantom-98 |
Beta Was this translation helpful? Give feedback.
-
Issue caused:January 31, when you merged the staging branch into main, the https://devcustomer.nayatel.com link from staging was promoted to the main branch, which caused the issue possible solution:
@phantom-98 @MuhammadTufailAli i hope this might help. Like my comment or follow my account, if this might help you out. |
Beta Was this translation helpful? Give feedback.
-
|
I have added you as a contributor. Please accept the request. Please also
tell me how to work on a single project and I don't get this type of issue.
Like we are 4 developer then how many branches we should make and things to
do to not get this conflict in future
…On Thu, 20 Feb 2025 at 09:36, Phantom ***@***.***> wrote:
phantom-98
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG6SQIIRKOJBSEIBGM32QVLVVAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRVHAYDAMQ>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
Beta Was this translation helpful? Give feedback.
-
|
|
Beta Was this translation helpful? Give feedback.
-
|
If i do merge from haseeb to staging branch no changes is detected why
…On Thu, 20 Feb 2025 at 11:03 AM, Phantom ***@***.***> wrote:
image.png (view on web)
</~https://github.com/user-attachments/assets/c1d4dd5e-ffe9-46e2-b4f8-ec5d84aeb56a>
There is no problem here in this repo
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG7GKZK2TI526FZH6GD2QVV3TAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRVHA2TKOA>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
I also sent you message on telegram
On Thu, 20 Feb 2025 at 11:06 AM, M. Tufail Ali Chaudhary <
***@***.***> wrote:
… If i do merge from haseeb to staging branch no changes is detected why
On Thu, 20 Feb 2025 at 11:03 AM, Phantom ***@***.***> wrote:
> image.png (view on web)
> </~https://github.com/user-attachments/assets/c1d4dd5e-ffe9-46e2-b4f8-ec5d84aeb56a>
> There is no problem here in this repo
>
> —
> Reply to this email directly, view it on GitHub
> <#151347 (reply in thread)>,
> or unsubscribe
> </~https://github.com/notifications/unsubscribe-auth/ATF2OG7GKZK2TI526FZH6GD2QVV3TAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRVHA2TKOA>
> .
> You are receiving this because you were mentioned.Message ID:
> ***@***.***
> com>
>
|
Beta Was this translation helpful? Give feedback.
-
|
@MuhammadTufailAli This problem is really weird. I think, it's a critical bug of git. Please contact git support team if needed. If you think the same with me, pls mark me as answer. Thank you. |
Beta Was this translation helpful? Give feedback.
-
|
How can i contact github support. I don't have github enterprise |
Beta Was this translation helpful? Give feedback.
-
|
Same i also consider it as a bug and mark your as an answer
…On Thu, 20 Feb 2025 at 8:16 PM, Phantom ***@***.***> wrote:
@MuhammadTufailAli </~https://github.com/MuhammadTufailAli> This problem is
really weird. I think, it's a critical bug of git. Please contact git
support team if needed. If you think the same with me, pls check me as
answer. Thank you.
—
Reply to this email directly, view it on GitHub
<#151347 (comment)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG2CZ55TWMDAYP5PK6T2QXWUZAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRWGQ4DMMI>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
|
Beta Was this translation helpful? Give feedback.
-
|
Can anyone from github community help me on this. I want to give a
resolution to my security team. Please help me asap.
Thanks
…On Thu, 20 Feb 2025 at 9:18 PM, Phantom ***@***.***> wrote:
mark your as an answer
?
—
Reply to this email directly, view it on GitHub
<#151347 (reply in thread)>,
or unsubscribe
</~https://github.com/notifications/unsubscribe-auth/ATF2OG5TOGZU3DTMAFYTLYL2QX54NAVCNFSM6AAAAABXBQKOQKVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTEMRWGU3DIMA>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
Beta Was this translation helpful? Give feedback.
-
Select Topic Area
Bug
Body
I have 5 branches in total
On 21 january 2025 zara commited on her branch and in file named InternetPage.tsx she changed links from
https://customer.nayatel.com to https://devcustomer.nayatel.com
Then she merged her code with staging branch
zara -> staging
After verifying things zara reverted back links and commited in her branch. Now Tufail, zara, haseeb-dev branch all have https://customer.nayatel.com link and only staging branch has https://devcustomer.nayatel.com link.
On 28 january tufail merge his code into staging branch but on file InternetPage.tsx github does not detect any difference but the links on both files were different in tufail branch link was
https://customer.nayatel.com
where as on staging branch it was
https://devcustomer.nayatel.com
After that 0n 31 january i merged code from staging to main. and the dev links goes to my main branch and they got live.
Due to this i lost many potiential customer. Can you please verify what was the problem.
Please do let me know if you need any of my assistance.
Thanks
Beta Was this translation helpful? Give feedback.
All reactions