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 3 (2b435be4040ed6621a190933ae459eeb837557cc -> 63ffc9d5c3aeea29694b817b97ea4dfdd18daa9b)
By: anonymous
Against ref: refs/heads/main
Date: 2022-08-09 19:32
This merge request can be merged without conflicts.
List of commits:
Subject Hash Author Date (UTC)
feedtree: polish status message 63ffc9d5c3aeea29694b817b97ea4dfdd18daa9b Alex 2022-08-09 19:32:03
Commit 63ffc9d5c3aeea29694b817b97ea4dfdd18daa9b - feedtree: polish status message
Author: Alex
Author date (UTC): 2022-08-09 19:32
Committer name: Alex
Committer date (UTC): 2022-08-09 19:32
Parent(s): 2b435be4040ed6621a190933ae459eeb837557cc
Signer:
Signing key:
Signing status: N
Tree: 6aae34e46d2a454b69950e60379a899514354f9a
File Lines added Lines deleted
feedtree.hws 1 2
File feedtree.hws changed (mode: 100755) (index 5d5e42c..3b2da43)
... ... Function p_Fetch(url$, e)
350 350 Return(#FEED_STATUS_ERROR) Return(#FEED_STATUS_ERROR)
351 351 EndIf EndIf
352 352 ElseIf e:GetInfo_Condition_Unmet() ElseIf e:GetInfo_Condition_Unmet()
353 mui.Set("status", "Contents", GetErrorName(err_code)
354 .." (skip downloading from " ..url$ ..")")
353 mui.Set("status", "Contents", "skipped downloading from " ..url$)
355 354 ;č Soubor na serveru se nezměnil ;č Soubor na serveru se nezměnil
356 355 ;č neděláme nic, vracíme úspěch ;č neděláme nic, vracíme úspěch
357 356 ;DebugPrint("skipped", url$) ;DebugPrint("skipped", url$)
Hints:
How to merge on your machine?
git fetch origin refs/mr/3:mr-3
git checkout main
git merge mr-3

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/3