05-15-2011
ok, i will post this output tomorow morning. do you have a procedure to resolve ip adress conflict?
10 More Discussions You Might Find Interesting
1. UNIX for Dummies Questions & Answers
I host a few websites for friends and lately my server has been bogging down at times. I think that it is because of a dns conflict. Someone said that by doing a nslookup I should be able to see it and then do a pkill -9 in.named and then do in.named to get it going again.
Any feedback on this... (1 Reply)
Discussion started by: thomi39
1 Replies
2. HP-UX
Hi,
I know this has been discussed a number of time but i could not get the exact answer. So need help again.
Issue:
The two command for same file system shows different size.
du -sk shows toatl size is 12780685 KB while df -k 45289229 used allocated Kb
/oxt/mantran/bin $ du -sk... (8 Replies)
Discussion started by: malaya_17
8 Replies
3. Solaris
I am trying to determine the root cause of a java process that dies trying to startup during it's cron job.
I did go ahead and change the time that it starts up in the cron file and now it starts successfully.
However is there a way to determine what PID a process was attempting to get when... (5 Replies)
Discussion started by: vedder191
5 Replies
4. Shell Programming and Scripting
I have a Microdia web cam. Some times it won't work if and only if there is a "HV7131R image sensor detected" statement in the boot up.
In this case when I try to get a .png snapshot all I get is a frame full of what appears to be white noise only it is mostly green.
Here is the command I am... (0 Replies)
Discussion started by: slak0
0 Replies
5. Solaris
Hi Gurus
I am in a strange situation.
I have a SUN sparc server . The server was having an IP say X..... (this IP X is now being used by another server)..... I have just installed fresh solaris 9 OS on the same server and given new IP say Y.
I also configured probe based IPMP with ce0 and... (2 Replies)
Discussion started by: ningy
2 Replies
6. Shell Programming and Scripting
I am using a script like this
source=$1
if ;
then
echo "got it"
else
echo "lost it"
fi
But the script is giving th error like
script.ksh: ==: unknown test operator
Can i know , is the syntax iam using is correct or suggest me a good way.
... (3 Replies)
Discussion started by: nani1984
3 Replies
7. Solaris
dear all,
kindly i want to check my server memory utilization i used alot of commands but i want to make sure that it is acurate let me explain
i have a server which has 32GB RAM
Total Memory = 33423360 kb
Free Memory = 4172568 kb
Utilized Memory = 29250792 kb
Memory Utilization... (2 Replies)
Discussion started by: maxim42
2 Replies
8. Ubuntu
Hi I am trying to configure NIS client on my Ubuntu 12.04.
But I could not put portmap without uninstalling rpcbind.
Do I need to have rpcbind there on the server, or how can I have both portmap and rpcbind at same time there on the server, because it's having conflict. (1 Reply)
Discussion started by: nixhead
1 Replies
9. Solaris
Hi forum,
I've run into a problem here and I can't seem to figure it out.
OS=Solaris 10 u11 SPARC.
This application (running on a local zone) was having a conflict with a port and I can't seem to find that port listed. (eg 41468)
I've tried
netstat -an|grep 41468
I am pretty sure this... (2 Replies)
Discussion started by: br1an
2 Replies
10. Solaris
I have a Sun T4-1 running Solaris 11.4 with a static IP 192.168.0.183. On this machine is a Solaris 10 LDOM with a static IP of 192.168.0.78. The other day I had to stop the LDOM to do a memory reconfigure. When I rebooted it I got an error that the IP 192.168.0.78 was already in use and so... (4 Replies)
Discussion started by: Michele31416
4 Replies
LEARN ABOUT LINUX
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>]
[--[no-]diff3] <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.
--diff3
Show conflicts in "diff3" style.
--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.5.3 01/14/2014 GIT-MERGE-FILE(1)