Is there another way to install updates on RHEL besides using the up2date utility?
I have some systems that are not accessible to the internet.
So, when I look for the updates that are supposed to be for my system, i dont even know where to go to download them? it just keeps bringing me to... (1 Reply)
I have one R710 Dell Box, when i try to install the RHEL on the system the installation stops with following error
"Assertion (heads < 256) at disk_dos.c:486 in function
probe_partition_for_geom() failed."
I 'm unable to ignore/cancel the same and have hard boot the server.
... (0 Replies)
I have dexx xps 14.I was installing rhel6.But the installation hanged at following step
initializing hardware detection.................
installion didnt go further (2 Replies)
hi,
i have a problem when i try to install Proliant support pack into a server with rhel 5.2
sv556:#/tmp/psp# ./hpsum -silent
./hpsum: error while loading shared libraries: libfreetype.so.6: cannot open shared object file: No such file or directory
i have already installed library... (3 Replies)
I have installled and configured wine on rhel 6 - 64bit system...
When i run wine command i faced a problem :
wine : could not exec wineserver
and when i run wineserver command i got the following error :
/usr/local/wine/bin/wineserver : /lib/ld-linux-x86-64.so.2 : bad ELF interpreter NO... (1 Reply)
i am in process to install R12.1.1 on RHEL 6.1.
while installing pre-requisite on RHEL 6.1 i am facing following error :
rpm -ivh xorg-x11-libs-compat-6.8.2-1.EL.33.0.1.i386.rpm
error: Failed dependencies:
libX11.so.6 is needed by xorg-x11-libs-compat-6.8.2-1.EL.33.0.1.i386
... (3 Replies)
Hi all,
Im studying rhcsa as of now, so yum installation and dependencies are messing me to not workit out.
i have dual os, win 7 & rhel 6.
i have tried this installation of vsftpd package with rhel 6 dvd in VM rhel 6 in win 7 as well as host rhel 6.still the same issue.
below error... (6 Replies)
Hi,
Sorry if this is an incorrect place for this question but I haven't been able to find any answers by searching the forums or on google. I am in the market for a new HP Z420 workstation and HP wants a lot more money for one with the HP Linux Installer kit vs. the exact same configuration in... (2 Replies)
I need to install xwindow on my RHEL 7.2 server which is behind a firewall and no access to internet. If I run the below code, it will not able to install, as my server dont have internet connection.
yum -y install xterm* xorg* xclock xauth
Do you know, where can I get the required binaries... (2 Replies)
My yum install command is failing. I first did yum clean all
I even tried with localinstall.
Below is the error output:
yum install mysql-community-server*.rpm
Loaded plugins: langpacks, product-id, search-disabled-repos, subscription-manager
This system is not registered with an... (8 Replies)
Discussion started by: mohtashims
8 Replies
LEARN ABOUT CENTOS
git-merge-file
GIT-MERGE-FILE(1) Git Manual GIT-MERGE-FILE(1)NAME
git-merge-file - Run a three-way file merge
SYNOPSIS
git merge-file [-L <current-name> [-L <base-name> [-L <other-name>]]]
[--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
<current-file> <base-file> <other-file>
DESCRIPTION
git merge-file incorporates all changes that lead from the <base-file> to <other-file> into <current-file>. The result ordinarily goes into
<current-file>. git merge-file is useful for combining separate changes to an original. Suppose <base-file> is the original, and both
<current-file> and <other-file> are modifications of <base-file>, then git merge-file combines both changes.
A conflict occurs if both <current-file> and <other-file> have changes in a common segment of lines. If a conflict is found, git merge-file
normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like
this:
<<<<<<< A
lines in file A
=======
lines in file B
>>>>>>> B
If there are conflicts, the user should edit the result and delete one of the alternatives. When --ours, --theirs, or --union option is in
effect, however, these conflicts are resolved favouring lines from <current-file>, lines from <other-file>, or lines from both
respectively. The length of the conflict markers can be given with the --marker-size option.
The exit value of this program is negative on error, and the number of conflicts otherwise. If the merge was clean, the exit value is 0.
git merge-file is designed to be a minimal clone of RCS merge; that is, it implements all of RCS merge's functionality which is needed by
git(1).
OPTIONS -L <label>
This option may be given up to three times, and specifies labels to be used in place of the corresponding file names in conflict
reports. That is, git merge-file -L x -L y -L z a b c generates output that looks like it came from files x, y and z instead of from
files a, b and c.
-p
Send results to standard output instead of overwriting <current-file>.
-q
Quiet; do not warn about conflicts.
--ours, --theirs, --union
Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines.
EXAMPLES
git merge-file README.my README README.upstream
combines the changes of README.my and README.upstream since README, tries to merge them and writes the result into README.my.
git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345
merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels a and c instead of tmp/a123 and tmp/c345.
GIT
Part of the git(1) suite
Git 1.8.3.1 06/10/2014 GIT-MERGE-FILE(1)