iam-git / IvoRSS (public) (License: MIT) (since 2022-06-16) (hash sha1)
simple RSS client for Amiga flavor OSes
Clone URLs: https://rocketgit.com/user/iam-git/IvoRSS ssh://rocketgit@ssh.rocketgit.com/user/iam-git/IvoRSS git://git.rocketgit.com/user/iam-git/IvoRSS
Merge request 1 (0a25299e82fc60cd3d4f2b1fdc0c7047b299bf78 -> 9e6e85bc191e313bbe842052bd92671bfece74c1)
By: anonymous
Against ref: refs/heads/main
Date: 2022-07-21 02:19
This merge request can be merged without conflicts.
List of commits:
Subject Hash Author Date (UTC)
pridat mezeru 9e6e85bc191e313bbe842052bd92671bfece74c1 Alex 2022-07-21 02:18:44
Commit 9e6e85bc191e313bbe842052bd92671bfece74c1 - pridat mezeru
Author: Alex
Author date (UTC): 2022-07-21 02:18
Committer name: Alex
Committer date (UTC): 2022-07-21 02:18
Parent(s): 0a25299e82fc60cd3d4f2b1fdc0c7047b299bf78
Signer:
Signing key:
Signing status: N
Tree: 6172f3342044088839b72bcbe712340824c47ca9
File Lines added Lines deleted
feedtree.hws 1 1
File feedtree.hws changed (mode: 100755) (index 6dbb04f..0949c3e)
... ... Function p_Fetch(url$)
266 266 Local err_code, xml$, count = ?DownloadFile(url$, Local err_code, xml$, count = ?DownloadFile(url$,
267 267 {Adapter="hurl", Fail404=True, Encoded=FindStr(url$, "%", True) <> -1}, {Adapter="hurl", Fail404=True, Encoded=FindStr(url$, "%", True) <> -1},
268 268 p_callback, url$) p_callback, url$)
269 p_Replay(err_code, count .. "bytes from " .. url$ .. " transmitted")
269 p_Replay(err_code, count .. " bytes from " .. url$ .. " transmitted")
270 270 CheckEvents() ; keep MUI even more responsive CheckEvents() ; keep MUI even more responsive
271 271 If err_code <> #ERR_NONE Then Return(#FEED_STATUS_ERROR) If err_code <> #ERR_NONE Then Return(#FEED_STATUS_ERROR)
272 272
Hints:
How to merge on your machine?
git fetch origin refs/mr/1:mr-1
git checkout main
git merge mr-1

To "see" all the merge requests as branches,
add, in the config file (.git/config), under the remote you want, a line like this:
fetch = +refs/mr/*:refs/remotes/your_remote_name_for_example_origin/mr/*
After you run a git fetch, you will have all the pull requests locally.
For example, you can merge one of them:
git checkout main
git merge mr/1