fix(content): palette error in Bungalow26 #3654
Merged
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
scarf005
approved these changes
Nov 13, 2023
There was a problem hiding this comment.
Since we squash merge PRs, git sees the first commit in PR and squash merged commit as completely different content, thus causing merge conflict.
While squash merges make history clean, it requires not reusing existing branches (i.e delete branches right after merge).
2023-11-13_11-02-27.mp4
For this PR, i dropped the first commit (which is same as #3650) to resolve the conflict.
I ran the same tests used in CI locally, and it passed. looks good to me.
also, it'd be helpful if we could erase empty sections and comments in PR body.
|
Ok, thanks for the help. GitHub is like sorcery to me
…On Sun., Nov. 12, 2023, 6:09 p.m. scarf, ***@***.***> wrote:
***@***.**** approved this pull request.
[image: image]
<https://user-images.githubusercontent.com/54838975/282344114-fbc7fbe8-ab2e-4908-96e9-60cb0f0c9bb3.png>
Since we squash merge PRs
<https://docs.github.com/ko/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits>,
git sees the first commit in PR and squash merged commit as completely
different content, thus causing merge conflict.
[image: image]
<https://user-images.githubusercontent.com/54838975/282344097-c070996b-2311-4a04-9c0d-40009da6855f.png>
While squash merges make history clean, it requires not reusing existing
branches (i.e delete branches right after merge).
https://github.com/cataclysmbnteam/Cataclysm-BN/assets/54838975/5d97838c-f818-4894-8271-fc33bbd497b7
For this PR, i dropped the first commit (which is same as #3650
<#3650>) to resolve
the conflict.
[image: image]
<https://user-images.githubusercontent.com/54838975/282345802-bf4ecea1-90b4-4014-8712-39e37b88ec34.png>
I ran the same tests used in CI locally, and it passed. looks good to me.
------------------------------
also, it'd be helpful if we could erase empty sections and comments in PR
body.
—
Reply to this email directly, view it on GitHub
<#3654 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ANRGAGHDB6P4V3FSO2WL5NTYEF6PJAVCNFSM6AAAAAA7IOFRVKVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMYTOMRWGQ2TANBYGY>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
SUMMARY: Bugfixes "palette errors in bungalow26"
Purpose of change
fixing submitted house