catalinux / rocketgit (public) (License: Affero GPLv3) (since 2015-03-19) (hash sha1)
Main RocketGit repo
Clone URLs: https://rocketgit.com/user/catalinux/rocketgit ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit git://git.rocketgit.com/user/catalinux/rocketgit
Merge request 4 (90f596e4fd8fa291b1da831bce609b486c7a5875 -> b1a3216235bf5b1545f513a98e9ba7f477c2ec0a)
By: anonymous
Against ref: refs/heads/master
Date: 2020-04-25 03:15
This merge request cannot be merged without conflicts.
Conflicts:
changed in both
base 100644 3d3618038c7c45d60612d34ef8a6af18ce743533 misc/compare.php
our 100644 053d52a0ab65d3e3e3ac3dd057bfed1b58e02dbb misc/compare.php
their 100644 43c256148af27d9050b98ce8baeaf4a34b4c0f4e misc/compare.php
@@ -172,12 +172,23 @@
foreach ($line as $i => $f) {
if (strstr($f, '/#')) {
$t = explode('/#', $f);
+<<<<<<< .our
$class = ' class="compare_' . $t[1] . '"';
$f = $t[0];
} else if ($i && strncasecmp($f, 'no', 2) == 0) {
$class = ' class="compare_bad"';
} else if ($i && strncasecmp($f, 'yes', 3) == 0) {
$class = ' class="compare_good"';
+=======
+ $color = ' style="background-color:#' . $t[1] . '" ';
+ $f = rg_xss_safe($t[0]);
+ } else if (stristr($f, 'no')) {
+ $color = ' style="background-color:#f00"';
+ $f = rg_xss_safe($f);
+ } else if (stristr($f, 'yes')) {
+ $color = ' style="background-color:#0f0"';
+ $f = rg_xss_safe($f);
+>>>>>>> .their
} else {
$class = '';
}
List of commits:
Subject Hash Author Date (UTC)
Moved html styling to css styling in compare file. b1a3216235bf5b1545f513a98e9ba7f477c2ec0a au 2020-04-25 03:15:06
Commit b1a3216235bf5b1545f513a98e9ba7f477c2ec0a - Moved html styling to css styling in compare file.
Author: au
Author date (UTC): 2020-04-25 03:15
Committer name: au
Committer date (UTC): 2020-04-25 03:15
Parent(s): 90f596e4fd8fa291b1da831bce609b486c7a5875
Signing key:
Tree: e355c806e3af521014e5c4bdc8cc101b70cbf3fe
File Lines added Lines deleted
misc/compare.php 3 3
File misc/compare.php changed (mode: 100644) (index 3d36180..43c2561)
... ... while (($line = fgetcsv($h)) !== FALSE) {
165 165 } }
166 166 } else if (strstr($f, '/#')) { } else if (strstr($f, '/#')) {
167 167 $t = explode('/#', $f); $t = explode('/#', $f);
168 $color = ' bgcolor="#' . $t[1] . '"';
168 $color = ' style="background-color:#' . $t[1] . '" ';
169 169 $f = rg_xss_safe($t[0]); $f = rg_xss_safe($t[0]);
170 170 } else if (stristr($f, 'no')) { } else if (stristr($f, 'no')) {
171 $color = ' bgcolor="#f00"';
171 $color = ' style="background-color:#f00"';
172 172 $f = rg_xss_safe($f); $f = rg_xss_safe($f);
173 173 } else if (stristr($f, 'yes')) { } else if (stristr($f, 'yes')) {
174 $color = ' bgcolor="#0f0"';
174 $color = ' style="background-color:#0f0"';
175 175 $f = rg_xss_safe($f); $f = rg_xss_safe($f);
176 176 } else { } else {
177 177 $color = ''; $color = '';
Hints:
How to merge on your machine?
git fetch origin refs/mr/4:mr-4
git checkout main
git merge mr-4

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