This repository was archived by the owner on May 9, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 16
Ship page style tweaks #73
Draft
alistair3149
wants to merge
11
commits into
richardthombs:master
Choose a base branch
from
alistair3149:refactor-shippage
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Ship page style tweaks #73
alistair3149
wants to merge
11
commits into
richardthombs:master
from
alistair3149:refactor-shippage
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73c13ae
to
984bb3d
Compare
I am having difficulty applying your PRs because they also include all of the other changes you have made. |
Hmm that's weird. I didn't include changes from the other PRs in the branch as you can see from the commit on my repo. Does rebasing work? EDIT: Oh I see. #67 was reverted and it was in master so all my branches was targeting the master that included it. The PR should be mergable if either #67 is merged or merge any of the current PRs since they all included #67 EDIT: I opened #74 that is identical to #67. Merging that to master will restore the branch back to the previous master or you can do a FF if you prefer |
Convert to draft because of rebase |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When this is finalized I will apply the relevant tweaks to other page types.