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

NOT TO BE MERGED - JUST SHOWS DIFFERENCE from 4.0.2 to 4.0.3 #1104

Closed
wants to merge 60 commits into from

Conversation

tghosth
Copy link
Collaborator

@tghosth tghosth commented Oct 26, 2021

No description provided.

@tghosth tghosth mentioned this pull request Oct 26, 2021
@ike
Copy link
Collaborator

ike commented Oct 26, 2021

This looks really great -- love the heading updates, removing "requirements" from headings, etc.

On that note, are there any links to specific headings that need to be updated based on these changes?

@tghosth
Copy link
Collaborator Author

tghosth commented Oct 27, 2021

I think any changes here should already be in bleeding edge, is that correct @elarlang ?

@cmlh
Copy link
Contributor

cmlh commented Oct 27, 2021

@tghosth states

I think any changes here should already be in bleeding edge, is that correct @elarlang ?

To compare we could try an interactive rebase onto the bleeding edge/main branch before reviewing the conflicting commits that would occur as a result of an unplanned merge?

@elarlang
Copy link
Collaborator

On that note, are there any links to specific headings that need to be updated based on these changes?

I think any changes here should already be in bleeding edge, is that correct @elarlang ?

Changes from bleeding edge were ported to v4.0.3. So there should be no changes which exists in v4.0.3 but not in bleeding edge. (Maybe except one title change by Josh). Is that answer for your concern? or I just can not understand the question...

@elarlang
Copy link
Collaborator

elarlang commented Oct 27, 2021

And to be clear - the activity itself is not "git merge", it is manually updating content from bleeding edge to v4.0.3.

Each change need to be checked manually - for example, some requirements are moved and have new number in bleeding edge, we can not merge this change to patch release, as it's breaking change. At the same time, moved requirement text is updated, but we can update requirement text for old number for v4.0.3.

@tghosth tghosth closed this Oct 28, 2021
Playgirlkaybraz11

This comment was marked as spam.

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.

8 participants