09-05-2013
I don't understand what you mean by "best" and "worst". There are ways to make a clone/backup of your installation. Using dd is one way to do it. If you prefer using a tool like clonezilla, that is fine, too.
Every tool has advantages and disadvantages. Start using the tools and you will find out more about them. As far as I can say, there is never a "best" way to do things. There is just a way or lots of ways...
10 More Discussions You Might Find Interesting
1. Solaris
dears
iam new in solaris i install solaris on my pc
can you help me in steps how can i create application using apache on solaris (3 Replies)
Discussion started by: murad.jaber
3 Replies
2. Programming
Hi,
I've created a simple application that is supposed to fill up a file with messages up
to the size I pass as parameter.
The problem is that once the file reaches the 2GB size, it stops growing.
The flow of the application, for what is worth, is as follows:
while ( bytes written <... (7 Replies)
Discussion started by: emitrax
7 Replies
3. Linux
Hi All,
I got this problem with my var logs, it got failed login as admin because it doesn't exist every 15 minutes and everyday.
Do you know some applications that try to create an application id as "admin"?
The problem is that this is a test server, so lots of applications installed and... (2 Replies)
Discussion started by: itik
2 Replies
4. AIX
Hi,
I have to write a shell script for disk space recovery - We have been facing disk space shortage issues very often.
d=`df -k |awk '{print $5}' | egrep "" | cut -c-2`
if
then
echo "DISK SPACE STATUS :NOT OK" >> /backup/stats/healthcheck/SCP1_BLU_HCsummary_$dt.txt
else
echo "DISK... (3 Replies)
Discussion started by: vasukv
3 Replies
5. Programming
Hi I am new to QT.I am running Qt 4.7 on Fedora 9.My Application crashes with the the following statements. on execution of
return app.exec();
The inferior stopped because it received a signal from the Operating System.
Signal name : SIGSEGV
Signal meaning :Segmentation fault:wall:
... (2 Replies)
Discussion started by: sruthihsr
2 Replies
6. Solaris
I'm preparing to recover a Oracle Fire X4170 server in a disaster recovery test at a different location than in prod. I have some questions about fdisk partitions. I'm using Solaris 10 update 10.
On my prod server, the boot disk has 2 partitions, diagnostic and solaris. Is the diagnostic... (1 Reply)
Discussion started by: TKD
1 Replies
7. Filesystems, Disks and Memory
Hi
I am new on your forum, because I need some help.
I have a server with debian and proxmox 2.
The HardDisk is broken.
I am in rescue mode, and I can't mount LVM partition to recover my backups.
What I've already done :
# fdisk -l
Disk /dev/sda: 2000.4 GB, 2000398934016 bytes
255... (0 Replies)
Discussion started by: pppplu
0 Replies
8. Red Hat
hi
every one
In linux, how to create a PATH for a application ?
i searched, but no positive response
any one like me got stuck with this problem? (3 Replies)
Discussion started by: rajeshz
3 Replies
9. Windows & DOS: Issues & Discussions
Getting error while creating windows recovery disc
Please see attachment (5 Replies)
Discussion started by: ravisingh
5 Replies
10. HP-UX
I have a B.11.31 U ia64 system where I swremove the disk driver "SerialSCSI-00 B.11.31.1303 PCI-X/PCI-E SerialSCSI" (by mistake). afterwards the system won;t boot because of the missing disk drivers. I'm trying to recover my kernel by using the image HP-ux_11_31_disc_1.iso
Run an Expert... (1 Reply)
Discussion started by: black_fender
1 Replies
LEARN ABOUT DEBIAN
git-mergetool
GIT-MERGETOOL(1) Git Manual GIT-MERGETOOL(1)
NAME
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSIS
git mergetool [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...]
DESCRIPTION
Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge.
If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without
conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, git mergetool will run
the merge tool program on every file with merge conflicts.
OPTIONS
-t <tool>, --tool=<tool>
Use the merge resolution program specified by <tool>. Valid merge tools are: araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the configuration
variable merge.tool is not set, git mergetool will pick a suitable default.
You can explicitly provide a full path to the tool by setting the configuration variable mergetool.<tool>.path. For example, you can
configure the absolute path to kdiff3 by setting mergetool.kdiff3.path. Otherwise, git mergetool assumes the tool is available in PATH.
Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by specifying
the command line to invoke in a configuration variable mergetool.<tool>.cmd.
When git mergetool is invoked with this tool (either through the -t or --tool option or the merge.tool configuration variable) the
configured command line will be invoked with $BASE set to the name of a temporary file containing the common base for the merge, if
available; $LOCAL set to the name of a temporary file containing the contents of the file on the current branch; $REMOTE set to the
name of a temporary file containing the contents of the file to be merged, and $MERGED set to the name of the file to which the merge
tool should write the result of the merge resolution.
If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable
mergetool.<tool>.trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the
resolution after the custom tool has exited.
-y, --no-prompt
Don't prompt before each invocation of the merge resolution program.
--prompt
Prompt before each invocation of the merge resolution program. This is the default behaviour; the option is provided to override any
configuration settings.
TEMPORARY FILES
git mergetool creates *.orig backup files while resolving merges. These are safe to remove once a file has been merged and its git
mergetool session has completed.
Setting the mergetool.keepBackup configuration variable to false causes git mergetool to automatically remove the backup as files are
successfully merged.
GIT
Part of the git(1) suite
Git 1.7.10.4 11/24/2012 GIT-MERGETOOL(1)