Skip to content

Comments

doc: fix typo and add bold weight to first mention of important terms in r.geomorphon manual page#4831

Merged
neteler merged 4 commits intoOSGeo:mainfrom
gregorywaynepower:main
Dec 20, 2024
Merged

doc: fix typo and add bold weight to first mention of important terms in r.geomorphon manual page#4831
neteler merged 4 commits intoOSGeo:mainfrom
gregorywaynepower:main

Conversation

@gregorywaynepower
Copy link
Contributor

@gregorywaynepower gregorywaynepower commented Dec 11, 2024 •
edited
Loading

  • Adds bolding around the first mention of search radius (L) and relief threshold (d) since the variables are referenced later on in the description.
  • Fixes typo in sentence starting with "...There are 3**8 = 6561 possible ternary patterns..."
  • Changes "However by eliminating all patterns that are results of either rotation or reflection of other patterns wa set of 498 patterns remain referred as geomorphons. This is a comprehensive and exhaustive set of idealized landforms that are independent of the size, relief, and orientation of the actual landform." to "However by eliminating all patterns that are results of either rotation or reflection of other patterns we get a set of 498 patterns remain referred as geomorphons. This is a comprehensive and exhaustive set of idealized landforms that are independent of the size, relief, and orientation of the actual landform."

@github-actions github-actions bot added raster Related to raster data processing HTML Related code is in HTML module docs labels Dec 11, 2024
@gregorywaynepower gregorywaynepower changed the title fix typo and add bold weight to first mention of important terms r.geomorphon docs: fix typo and add bold weight to first mention of important terms Dec 11, 2024
veroandreo
veroandreo previously approved these changes Dec 15, 2024
View reviewed changes
Copy link
Contributor

@veroandreo veroandreo left a comment

Choose a reason for hiding this comment

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

Thanks!

neteler
neteler reviewed Dec 15, 2024
View reviewed changes
@veroandreo veroandreo changed the title r.geomorphon docs: fix typo and add bold weight to first mention of important terms doc: fix typo and add bold weight to first mention of important terms in r.geomorphon manual page Dec 15, 2024
neteler
neteler approved these changes Dec 20, 2024
View reviewed changes
Copy link
Member

@neteler neteler left a comment

Choose a reason for hiding this comment

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

Thanks!

@neteler neteler added this to the 8.5.0 milestone Dec 20, 2024
@neteler neteler added the backport to 8.4 PR needs to be backported to release branch 8.4 label Dec 20, 2024
@neteler neteler merged commit 9fd2ceb into OSGeo:main Dec 20, 2024
@neteler
Copy link
Member

neteler commented Dec 20, 2024

I tried to backport it but get:

12:12 $ git push upstream releasebranch_8_4
Enumerating objects: 46, done.
Counting objects: 100% (31/31), done.
Delta compression using up to 12 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (19/19), 4.29 KiB | 4.29 MiB/s, done.
Total 19 (delta 14), reused 9 (delta 6), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (14/14), completed with 10 local objects.
remote: error: GH013: Repository rule violations found for refs/heads/releasebranch_8_4.
remote: Review all repository rules at https://github.com/OSGeo/grass/rules?ref=refs%2Fheads%2Freleasebranch_8_4
remote: 
remote: - This branch must not contain merge commits.
remote:   Found 1 violation:
remote: 
remote:   cf219d0854cf3c67b547295547f606b1506ab2bd
remote: 
To github.com:OSGeo/grass.git
 ! [remote rejected]       releasebranch_8_4 -> releasebranch_8_4 (push declined due to repository rule violations)
error: failed to push some refs to 'github.com:OSGeo/grass.git'

Does anyone know how to get rid of this problem?

@echoix
Copy link
Member

echoix commented Dec 20, 2024

I tried to backport it but get:

12:12 $ git push upstream releasebranch_8_4

Enumerating objects: 46, done.

Counting objects: 100% (31/31), done.

Delta compression using up to 12 threads

Compressing objects: 100% (13/13), done.

Writing objects: 100% (19/19), 4.29 KiB | 4.29 MiB/s, done.

Total 19 (delta 14), reused 9 (delta 6), pack-reused 0 (from 0)

remote: Resolving deltas: 100% (14/14), completed with 10 local objects.

remote: error: GH013: Repository rule violations found for refs/heads/releasebranch_8_4.

remote: Review all repository rules at https://github.com/OSGeo/grass/rules?ref=refs%2Fheads%2Freleasebranch_8_4

remote: 

remote: - This branch must not contain merge commits.

remote:   Found 1 violation:

remote: 

remote:   cf219d0854cf3c67b547295547f606b1506ab2bd

remote: 

To github.com:OSGeo/grass.git

 ! [remote rejected]       releasebranch_8_4 -> releasebranch_8_4 (push declined due to repository rule violations)

error: failed to push some refs to 'github.com:OSGeo/grass.git'

Does anyone know how to get rid of this problem?

When you updated your local branch, did you create a merge commit locally when pulling (and you did the commit before updating the local branch)

@neteler
Copy link
Member

neteler commented Dec 20, 2024 •
edited
Loading

When you updated your local branch, did you create a merge commit locally when pulling (and you did the commit before updating the local branch)

I see (almost): and how to get out of this?

Seems to be here:

commit be0a4be9ffc3e06333df82313900f04827f048b9 (HEAD -> releasebranch_8_4)
Author: Gregory Power <[email protected]>
Date:   Fri Dec 20 06:11:27 2024 -0500

    doc: fix typo and add bold weight to first mention of important terms in r.geomorphon manual page (#4831)
    
    * fix typo

commit cf219d0854cf3c67b547295547f606b1506ab2bd (origin/releasebranch_8_4)
Merge: ce47f4ae9e f8f7f9667f
Author: Markus Neteler <[email protected]>
Date:   Fri Dec 20 10:58:32 2024 +0100

    Merge remote-tracking branch 'upstream/releasebranch_8_4' into releasebranch_8_4

commit f8f7f9667f64b59332dd8e18b86d8d3f95f2b254 (upstream/releasebranch_8_4)
Author: Edouard Choinière <[email protected]>
Date:   Wed Dec 18 17:40:25 2024 -0500

    CI: Assign milestone on merged PRs (#4414)
...

@echoix
Copy link
Member

echoix commented Dec 20, 2024

Rebase (make sure you don't push a changed commit) or reset your local branch some commits before, then pull at least one commit that is in releasebranch, then cherry pick again.

neteler pushed a commit that referenced this pull request Dec 20, 2024
@gregorywaynepower @neteler
doc: fix typo and add bold weight to first mention of important terms…
b42fdd2 
… in r.geomorphon manual page (#4831)

* fix typo
@neteler
Copy link
Member

neteler commented Dec 20, 2024

Solved with local support by @mmacata :)

@gregorywaynepower gregorywaynepower mentioned this pull request Feb 3, 2025
Merged
@neteler neteler removed the backport to 8.4 PR needs to be backported to release branch 8.4 label Apr 2, 2025
@neteler neteler modified the milestones: 8.5.0, 8.4.2 Apr 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@veroandreo veroandreo veroandreo left review comments

@neteler neteler neteler approved these changes

Assignees

@neteler neteler

Labels

docs HTML Related code is in HTML module raster Related to raster data processing

Projects

None yet

Milestone

8.4.2

Development

Successfully merging this pull request may close these issues.

4 participants

@gregorywaynepower @neteler @echoix @veroandreo