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.

Sign up for GitHub

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

Jump to bottom

README instructions and photo are slightly contradictory #883

Open
Julian opened this issue Jul 18, 2023 · 2 comments · May be fixed by #884
Open

README instructions and photo are slightly contradictory #883

Julian opened this issue Jul 18, 2023 · 2 comments · May be fixed by #884

Comments

@Julian
Copy link

Julian commented Jul 18, 2023 •
edited
Loading

(Hi! Thanks, nice looking tool. Just a very minor incongruity I figured I'd mention in case it's useful)

The setup instructions say:

Set the repo to only support merge commits

But the screenshot shown just below show the opposite, checking only squash merges:

image

I don't personally generally recommend doing that in a git repo, but if there's some reason why landscapes really do need to always merge using squash then probably the simple fix is to just tweak the text above to say "squash merge" rather than "merge". Happy to send a PR if so, but filing this first since I wasn't sure which is actually correct, the text or the image, or whether really this step isn't actually required.
@AndreyKozlov1984
Copy link
Contributor

Hi, Julian! The landscape started its development 6 years ago, and no one could guess where it will lead to! Please use your favourite approach, "allow squash merging", it is a best one so far!

Feel free to make a PR for a change to the README and, please, metion me, @AndreyKozlov1984 , when you create it, I'll be happy to merge!

Julian added a commit to Julian/landscapeapp that referenced this issue Jul 18, 2023
@Julian
Mention squash merges are optional and clarify the wording.
4498cae 
Closes: cncf#883
Julian added a commit to Julian/landscapeapp that referenced this issue Jul 18, 2023
@Julian
Mention squash merges are optional and clarify the wording.
1363605 
Closes: cncf#883
@Julian Julian linked a pull request Jul 18, 2023 that will close this issue
Open
@Julian
Copy link
Author

Julian commented Jul 18, 2023

The landscape started its development 6 years ago, and no one could guess where it will lead to!

Amazing, thanks for the quick response and congrats on the success!

PR sent in #884!

Julian added a commit to Julian/landscapeapp that referenced this issue Jul 18, 2023
@Julian
Mention squash merges are optional and clarify the wording.
692f786 
Closes: cncf#883

Signed-off-by: Julian Berman <[email protected]>
Julian added a commit to Julian/landscapeapp that referenced this issue Sep 12, 2023
@Julian
Mention squash merges are optional and clarify the wording.
391246b 
Closes: cncf#883

Signed-off-by: Julian Berman <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Mention squash merges are optional and clarify the wording. Julian/landscapeapp
2 participants
@AndreyKozlov1984 @Julian