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

PR: Update RELEASE.md for 1.x version #293

Merged
merged 2 commits into from
Dec 3, 2021

Conversation

dalthviz
Copy link
Member

@dalthviz dalthviz commented Dec 2, 2021

Update RELEASE.md following current branch structure (master and 1.x) and add some missing info

@dalthviz dalthviz added this to the v1.11.3 milestone Dec 2, 2021
@dalthviz dalthviz self-assigned this Dec 2, 2021
@CAM-Gerlach
Copy link
Member

CAM-Gerlach commented Dec 2, 2021

Per discussion with @dalthviz , given there are some important additions here that would be very useful in master as well, and the structure and formatting is a lot better than what I originally did, I'm going to integrate the master changes in here and fix a few typos/grammar issues, so we can then non-null merge all these improvements to master with just a find-replace of 1.x to master and tweaking the package build line. Marking it as draft until that's done...

@CAM-Gerlach CAM-Gerlach marked this pull request as draft December 2, 2021 20:50
@CAM-Gerlach CAM-Gerlach marked this pull request as ready for review December 3, 2021 00:15
@CAM-Gerlach CAM-Gerlach self-assigned this Dec 3, 2021
Copy link
Member

@CAM-Gerlach CAM-Gerlach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @dalthviz for the great improvements! LGTM now that I synced the additions and improvements with those in master, minus a few master-specific things. @ccordoba12 and @dalthviz , would you mind reviewing? Once this is ready, I can take care of the merge, as there are a few things (a couple more than I initially thought) that I'll need to take care of when merging to master. Thanks!

Copy link
Member Author

@dalthviz dalthviz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @CAM-Gerlach for the changes! LGTM 👍

Copy link
Member

@ccordoba12 ccordoba12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks @dalthviz and @CAM-Gerlach!

@dalthviz dalthviz merged commit e8e5b24 into spyder-ide:1.x Dec 3, 2021
@dalthviz
Copy link
Member Author

dalthviz commented Dec 3, 2021

You will take care of the merge with master right @CAM-Gerlach ?

@CAM-Gerlach
Copy link
Member

Yup, in work now

@dalthviz
Copy link
Member Author

dalthviz commented Dec 3, 2021

Just in case @CAM-Gerlach I merged #278 (maybe that can affect the merge you started doing 😅 )

@CAM-Gerlach
Copy link
Member

Yeah, you could say it "affected" it...if by "affected" you mean blocked me when I tried to push and forced me to start over since it created new commits on upstream between the time I started the merge and when I finished 😆

It wasn't that bad, I did some juGitsu and managed to not have to do everything over, just the Git parts haha, just FYI next time let's maybe not merge something to master at the same time, hmm? 😉

CAM-Gerlach added a commit that referenced this pull request Dec 3, 2021
@CAM-Gerlach
Copy link
Member

In all seriousness, it took me longer to write that than actually fix the problem jaja, no worries

@CAM-Gerlach
Copy link
Member

Also, separately merged the release per the new release guide

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants