madskristensen / SolutionColors

A Visual Studio extension
Apache License 2.0
77 stars 11 forks source link

Merge pull request #1 from madskristensen/master #21

Closed ghost closed 9 months ago

ghost commented 1 year ago

Merge changes from base to my repo

madskristensen commented 1 year ago

Was this an intentional PR?

ghost commented 1 year ago

Mads what is the correct way to update my fork of your base repos? When I see your have a new version and I want my unchanged repo to be updated to your new version.

Sent via the Samsung Galaxy S22 Ultra 5G, an AT&T 5G smartphone Get Outlook for Androidhttps://aka.ms/AAb9ysg


From: Mads Kristensen @.> Sent: Monday, October 10, 2022 2:15:51 PM To: madskristensen/SolutionColors @.> Cc: Danny McNaught @.>; Author @.> Subject: Re: [madskristensen/SolutionColors] Merge pull request #1 from madskristensen/master (PR #21)

Was this an intentional PR?

— Reply to this email directly, view it on GitHubhttps://github.com/madskristensen/SolutionColors/pull/21#issuecomment-1273663441, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AQCSP6VSUOIEYB2QCFVXLMLWCRMNPANCNFSM6AAAAAARAOI2ZA. You are receiving this because you authored the thread.Message ID: @.***>

madskristensen commented 1 year ago

I'm not sure, since I'm not very good at Git. I think you can do a git rebase from origin/master or soemthing like that