Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PNW-2019 - Fix rebase to make it correctly on stack change use case #16

Merged
merged 1 commit into from
Apr 24, 2024

Conversation

dfdez
Copy link
Collaborator

@dfdez dfdez commented Apr 23, 2024

ℹ️ What's this PR do?

  • Update rebase branch to don't create conflicts when changes are made

👀 Where should the reviewer start?

  • packages/netlify-cms-backend-github/src/API.ts

📱 How should this be tested?

As reviewer, remember you always have to test the code locally on your machine. To do so follow these instructions:

  1. Checkout the PR branch
  2. Start the landing you want to test by running npm run dev <landing-name>
  3. You will have the site available at http://localhost:8000

Do you need to start multiple landings affected in a git diff?

  1. Checkout the PR branch
  2. Find the commit SHA you want to diff from
  3. Start the landings affected in a git diff with commit SHA like this: npm run dev -- --diff=<COMMIT_SHA>
  4. Check out this confluence page for more details about diff in monorepo here

To test this we should:

  1. Create a test branch to reproduce the use case.
  2. Update the main branch on the CMS to the created branch

Now that we have the basic setup let's reproduce the use case, in order to reproduce this issue follow this steps:

  1. Create a stack change
  2. Make a change in a collection.
  3. Update is made on master
  4. Another change is introduced to the same collection that was altered in step 2.
  • Test that with feature/PNW-2019_rebase-fix the rebase is not beign made with the main branch

@dfdez dfdez self-assigned this Apr 23, 2024
@dfdez dfdez changed the title fix: fixed rebase to make it correctly on stack change use case PNW-2019 - Fix rebase to make it correctly on stack change use case Apr 23, 2024
@dfdez dfdez marked this pull request as ready for review April 23, 2024 15:02
@dfdez dfdez requested a review from acrusella April 24, 2024 11:13
@dfdez dfdez merged commit d0d2e77 into fork Apr 24, 2024
6 of 9 checks passed
@dfdez dfdez deleted the feature/PNW-2019_rebase-fix branch April 24, 2024 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants