This has been resolved.
Thanks to everyone who helped :)
On Wed, Feb 10, 2021 at 12:36 PM Anshum Gupta
wrote:
> Can you elaborate more around this? I was also trying to see if I could
> just create a PR to merge production -> master, but that would just mess
> up the history. It will bring
Can you elaborate more around this? I was also trying to see if I could
just create a PR to merge production -> master, but that would just mess
up the history. It will bring the code in sync but I'm also not sure if
that would fix the larger problem.
On Wed, Feb 10, 2021 at 12:01 PM Michael
Have you considered using a merge commit for this? That won't require
force pushing
On Wed, Feb 10, 2021 at 2:51 PM Anshum Gupta wrote:
>
> Hi All,
>
> Seems like during the last release, we directly committed the website changes
> to the production branch, bypassing the master. This is now
Hi All,
Seems like during the last release, we directly committed the website
changes to the production branch, bypassing the master. This is now causing
issues with merging updates from master into prod using the simple 'create
PR' -> 'merge master to prod' workflow.
I was working with
