chore: merge/backport fixes from staging to release - #656
Closed
0xFA11 wants to merge 1 commit into
Closed
Conversation
0xFA11
requested review from
JesseOlmer,
LukeStampfli,
jeffreyrainy and
mattwalsh-unity
March 23, 2021 10:30
mattwalsh-unity
suggested changes
Mar 23, 2021
mattwalsh-unity
left a comment
mattwalsh-unity
left a comment
Contributor
There was a problem hiding this comment.
Great to get this done. However, please make one commit for the documentation changes and a separate one for the tick testing code change.
0xFA11
marked this pull request as draft
March 23, 2021 16:18
Contributor
Author
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
we have some changes that went into
chore/release-to-masterbranch which is basically the branch where we mergerelease/0.1.0intomasterbranch including merge conflict resolutions — it's currently being PR'd as #652..github/ISSUES_TEMPLATE/*changes merged frommastertochore/release-to-master.editorconfig&.gitattributesfiles from the repository root.editorconfigwith Unity C# Standards compliant one.gitattributesincluding Unity Smart Merge (YAML Merge)also, keep in mind that we'll ultimately merge
release/0.1.0branch intodevelopbranch, deleterelease/0.1.0branch after we're done with it and move on underdevelopbranch (see Gitflow Workflow for the reference →).