server/user-documentation
10
3
Fork 8
Code Issues Pull requests 2 Projects Activity

Fix typo in modules/ROOT/pages/installation/index.adoc #179

Merged
sgallagh merged 1 commit from :fix/bgryzyng/install-doc-typo into main 2026-05-14 13:04:54 +00:00
Conversation 4 Commits 1 Files changed 1 +1 -1
bgryzyng commented 2026-05-12 16:05:01 +00:00
Contributor
Copy link

Fix typo.

Fix typo.
Fix typo.
sgallagh approved these changes 2026-05-12 16:40:24 +00:00
pboy self-assigned this 2026-05-14 08:42:14 +00:00
pboy removed their assignment 2026-05-14 08:42:37 +00:00
pboy commented 2026-05-14 08:43:09 +00:00
Owner
Copy link

@sgallagh Do you know what the message "This branch does not contain the latest Commits from the base branch" means in forgejo! Can we merge without loosing those previous commits?

@sgallagh Do you know what the message "This branch does not contain the latest Commits from the base branch" means in forgejo! Can we merge without loosing those previous commits?
sgallagh commented 2026-05-14 13:02:12 +00:00
Owner
Copy link

It means it either needs to be rebased or merged with a merge commit.

It means it either needs to be rebased or merged with a merge commit.
sgallagh commented 2026-05-14 13:04:36 +00:00
Owner
Copy link

Sorry, for more detail: it means that the branch this is targeting (main) has had additional commits pushed to it since this merge request was created. As a result, this patch either needs to be "rebased" (which means, instead of applying atop an older version of the main branch, it needs to apply atop the latest) or else a merge commit will be added that resolves things.

In this case, it's such a trivial patch that merging with an automatic rebase is probably the simplest option, which I will go ahead and do.

Sorry, for more detail: it means that the branch this is targeting (`main`) has had additional commits pushed to it since this merge request was created. As a result, this patch either needs to be "rebased" (which means, instead of applying atop an older version of the `main` branch, it needs to apply atop the latest) or else a merge commit will be added that resolves things. In this case, it's such a trivial patch that merging with an automatic rebase is probably the simplest option, which I will go ahead and do.
Sign in to join this conversation.
Reviewers
No reviewers
sgallagh
Labels
Clear labels   
in progress

   
in progress
Work started

  
meeting
Scheduled for the next SIG meeting

  
need info
Additional information required

  
ongoing work project
Decided working task of the working group

  
on hold
temporarily interrupted

  
pending activity
Work awaiting being taken on

  
release test
test task for the next release

  
user documentation
ongoing work to update and improve documentation

No labels
in progress
in progress
meeting
need info
ongoing work project
on hold
pending activity
release test
user documentation
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
server/user-documentation!179
No description provided.