Questions tagged [merge]
The merge tag has no usage guidance.
395
questions
112
votes
1
answer
298k
views
GIT merge master into a branch
I have been developing a new feature on a new branch, and on the side have committed quite a few changes on my master branch.
Is it possible to merge the master branch into my new branch to keep it ...
61
votes
10
answers
132k
views
How to merge multiple PDF files onto one page with pdftk?
I have a range of PDF files 1.pdf, 2.pdf, etc. that I would like to merge into one file, with all the PDFs tiled on one page.
Currently, I have tried pdftk to merge these files, but they are put on ...
60
votes
1
answer
231k
views
How can I merge two branches without losing any files?
I have two branches with the following files in there:
branch a:
file_a
file_b
file_c
branch b:
file_a
file_d
file_e
I want to merge them, so that I get both files from a and b (and files that ...
58
votes
6
answers
97k
views
How to merge (and not replace) folders when copying on the Mac?
There's a similar question about windows. This is the same, but for mac. By the way, it's odd there's no question on this yet, since it seems like it's the most hated thing on Mac OS X.
If I try to ...
56
votes
8
answers
216k
views
How can I merge two mp4 files without losing quality?
I have two high-quality mp4 files, which are of two parts of the same show.
I want to merge them together into 1 file, and I usually use VirtualDub to merge my files... But it doesn't seem to support ...
34
votes
3
answers
14k
views
How can I Resync a fork from original
I just forked a project in Github. I made modifications and sent a pull request. The owner merged my fork with the main project and after that he made some modifications. So for now my fork is not ...
32
votes
4
answers
20k
views
interactive/visual merge tool for console?
I'm a big fan of meld - a visual diff and merge tool for Gnome. It shows two files (or directories) side-by-side and with their differences highlighted, and I can easily select which parts I want to ...
29
votes
2
answers
58k
views
How to "abort" merge in IntelliJ Idea
Let's say I am merging and just before the push I decide that I do not want to merge. Is it possible to get rid of the commits I have merged (and not pushed yet) without deleting my local branch or ...
24
votes
6
answers
28k
views
Alternative for WinMerge in Ubuntu
I need to compare/diff/merge files in an easy way. In windows I would use WinMerge. What alternatives for this are available in Ubuntu?
The things I must be able to do:
See 2 files line by line next ...
22
votes
2
answers
15k
views
Get recursive list of different files in Winmerge (without folder tree/structure)
I prefer Winmerge to Diffmerge, but the one thing I envy is Diffmerge's folder diff feature.
Diffmerge shows, for complicated folders and subfolders, only different files (not folders).
Winmerge ...
21
votes
3
answers
84k
views
How to merge 2 columns into one in LibreOffice or OpenOffice?
In my CSV, I have two columns which are really just one column, so I want to concatenate the content of these two columns - for each row - into the first one(after this I want to remove the extra ...
21
votes
2
answers
14k
views
Joining two pdfs with slightly different page size with pdfjoin
I'm trying to merge multiple PDF files by using pdfjoin. However the joined PDF is not right beacuse orientation for some text is changed. I have checked all options of pdfjoin, enforcing orientation ...
18
votes
8
answers
155k
views
Merging two cells in multiple rows
I have an excel spreadsheet with two cells in each row that I'd like to merge. Highlighting all the cells of interest and just merging from the cell formatter seems to just merge all the cells ...
16
votes
7
answers
51k
views
Merge AVI-files without recoding in Mac OS X Lion
Is there a (at best free) solution to merge AVI-Files in Mac OS X Lion without the need to recode them? (Until Snow Leopard I used D-Vision 3, which won't run on Lion because it's PPC.)
15
votes
5
answers
432k
views
How to Merge Data From Multiple Excel Files into a Single Excel File or Access Database?
I have a few dozen excel files which are all of the same format (i.e. 4 worksheets per Excel file). I need to combine all the files into 1 master file which must have just 2 of the 4 worksheets. The ...
15
votes
3
answers
17k
views
How to concatenate two flv files?
I want to concatenate two flv files(downloaded from Youtube.com) by Linux command line tools.
The ffmpeg tutorial is too complicated, so I tried the mencode tutorial.
But I get a empty output. I don't ...
14
votes
6
answers
44k
views
How can I merge or concatenate two or more MP4 files creating another MP4 file? [duplicate]
How can I concatenate or merge 2 or more MP4 files, in a final output MP4 file also?
I have tried in the DOS window to use the COPY command (I have read it somewhere) but it doesn't function well.
14
votes
1
answer
43k
views
How to rip a DVD with multiple titles into a single MKV
I have a digital backup of a concert DVD consisting of several VOB files and on that DVD each title corresponds to an individual song. When i tried to convert it to an MKV with Handbrake i could only ...
9
votes
4
answers
18k
views
Virtualbox, merging snapshots and base disk
I have a virtual machine with about 30 snapshots in branches. The current development path is 22 snapshots plus the base disk. The amount of files is seemingly having an impact now on IO and the dev ...
9
votes
1
answer
2k
views
Merging threads in Thunderbird [duplicate]
Is it possible to merge threads in Thunderbird?
I recently got into a discussion where one person was consistently not using "Reply", but starting new threads. I'd like to merge all such emails into ...
8
votes
2
answers
25k
views
Is there a way to combine text files using the Windows command line?
I am thinking looking for a way to combine all the .txt files in a directory into a single one .txt file.
Is there a way to combine text files using the Windows command line?
8
votes
3
answers
8k
views
How to merge pdfs and create bookmarks for each input file in output file? (linux)
I'm using Linux and I would like to have software (or script, method) which merges some pdfs and creates an united output pdf, containing bookmarks. Bookmarks are named by filename of pdf files, ...
8
votes
7
answers
22k
views
merge/join/concatenate hundreds of ts files into one ts file
Downloading a video stream with curl, I ended up with ~400 *.ts files, each about 1MB in size. They are sequentially numbered video1.ts, video2.ts, ...video400.ts. I now need to concatenate them into ...
8
votes
5
answers
58k
views
How can I merge hundreds of Excel spreadsheet files?
I have hundreds of excel files which are all of the same format (i.e. 4 worksheets per Excel file). I need to combine all the files into 1 all singing and dancing file which must have the same format ...
8
votes
1
answer
11k
views
Merge two images with transparency in imagemagick
I have two images without transparency (two photos) and I want to combine these images into one image where first image covers second image. How to scale these images to the same size and merge with ...
8
votes
3
answers
17k
views
How do I merge an array of images into a single giant image?
I have 220 png images of equal height and width with the following naming convention:
A1.png, A2.png, ... V9.png, V10.png
I need to merge them into one giant image, with A1 being the top left corner, ...
8
votes
3
answers
3k
views
Read non-blocking from multiple fifos in parallel
I sometimes sit with a bunch of output fifos from programs that run in parallel. I would like to merge these fifos. The naïve solution is:
cat fifo* > output
But this requires the first fifo to ...
7
votes
4
answers
6k
views
Merge by date multiple log files that also include un-dated lines (e.g. stack traces)
How can I merge log files, i.e. files that are sorted by time but that also have multi-lines, where only the first line has the time, and the remaining ones have not.
log1
01:02:03.6497,2224,0022 ...
7
votes
2
answers
6k
views
Dropbox modification of file in 2 different places at once
Suppose I have a source code file in my dropbox which I have worked on from my desktop machine, and the version in my laptop is out-of-date because I haven't had internet access or the company proxy ...
7
votes
2
answers
90k
views
merge two rows in excel worksheet where one cell has same content but other cells have different content
My problem is that in my excel worksheet of several thousand entries the item (eg widget a) is included in more than one row, with different attributes listed in the different rows. Aside from the ...
6
votes
2
answers
28k
views
Concatenate two mp4 videos into one file [duplicate]
Possible Duplicate:
How can I merge or concatenate two or more MP4 files creating another MP4 file?
I recently ripped my DVD collection to play them on my media center PC, and several of them ...
6
votes
4
answers
108k
views
How can I merge two folders in Windows?
I need to merge 2 folders together that will contain some of the same files, and some new ones. There are a LOT of files to merge in. I know you can rename the source folder to the same as the ...
6
votes
3
answers
480
views
How to merge rows with Excel?
I have a worksheet containing:
ID VALUE1 VALUE2
--------------------------
ABC 8274
DEF 613
GHI 236
ABC 11.13
XYZ 173
GHI ...
6
votes
2
answers
38k
views
Merge Excel rows from two sheets
I'd like to start this question by apologizing, there are numerous questions about merging excel rows, still, after browsing the web AND the list of "Questions that may already have your answer", I ...
6
votes
4
answers
8k
views
What's the fastest way to combine two or more files in Linux?
I want to combine two or more files in Linux, so I am using the following command:
cat small_file LARGE_File LARGER_FILE > SUM_OF_FILES
However this runs very slow.
Does anyone know a Linux tool ...
6
votes
2
answers
6k
views
Merge many DJVU files into one file
I have a bunch of DJVU files (1.djvu, 2.djvu, etc). I want to merge these into one single file, either in DJVU format or PDF format. What is the best way of doing that? I am using Windows 7 and have ...
6
votes
1
answer
5k
views
Can I merge two btrfs without data loss
I have a btrfs device mounted, it is composed of 2 partitions and it is in single mode (the partitions does not have the same size so I can't use raid 0 ).
I have another disk formatted in ext4, I ...
5
votes
6
answers
36k
views
Merge Visio files
I know I can do this manually by using copy/paste but I'm looking for a simpler way.
Does anyone know of a quick and easy way to merge Visio documents? I have several Visio vsd files, all of which ...
5
votes
2
answers
16k
views
Can checkout and track git branch, but cannot pull
So we have a branch in our git repo called creative_market. I run the command git checkout --track origin/creative_market which works fine. All of the changes that should be on the creative_market ...
5
votes
2
answers
6k
views
How do I save a whole MS Word document to single-paged PDF?
I am working with MS Word and there are quite a few places where I care about the final look of the document. I don't want to split certain parts (for example pasted source code). I also don't want to ...
5
votes
2
answers
6k
views
How to merge .001, .002 ... files from multiple drives?
Is there a way to merge multiple part files (.0001, .0002, etc.) from multiple drives?
I have three part files of 5 GB each, but I have only 20 GB on the hard drive. I would need another 10 GB to ...
5
votes
4
answers
4k
views
How to hide other team member's calendar entries if I have them too?
Since I'm displaying the calendars of other team members, I see appointments where more than one of them (including me or not) participate for every participant. Is there any way to visually merge ...
4
votes
2
answers
44k
views
How do I merge two Excel columns into one?
Let's say we have two columns/ranges A1:A10 (group A) and B5:B50 (group B) and we need to merge the two into one column in C1:C60 (60 in C = 10 from A + 50 from B)
Data in group A & group B can ...
4
votes
3
answers
783
views
Can I answer "No to All" when doing a copy in Windows?
When copying/merging large directory structures under Windows, is it possible to do something like "Yes to all" but in reverse so that all existing files are not overwritten?
There is a similar ...
4
votes
4
answers
7k
views
Merging two vertical blocks with vim
I have 2 files
file1.txt
a =
b =
file2.txt
1
2
Can I merge them using gvim so that the output looks like :
a = 1
b = 2
4
votes
3
answers
27k
views
Merge table columns in Word 2003 or Word 2010
How can I merge two table columns in Word 2003 or Word 2010?
4
votes
4
answers
4k
views
How do I compare contents of folder, files?
Is there a way to natively compare files and folders for content, perhaps in command prompt? If not, is there a good program for that?
I've heard of WinMerge, is it any good?
4
votes
3
answers
26k
views
Merging and re-formatting paragraphs in Microsoft Word 2007
After a copy/paste mishap in Microsoft Word 2007, I ended up with text looking like this:
This line breaks up here
continues here, and so on
here, when it should all be
in a single line ...
4
votes
2
answers
27k
views
How to manually merge files downloaded by IDM?
For the last couple of days, I've been downloading an .exe file; its size is about 1.73 GB. The TEMP folder was on E:\. When it's done, IDM merged about 1.5 GB
and gave me an error about no free ...
4
votes
3
answers
724
views
Polish before git merge?
I want to merge user branches into master, however, do some code review & modification before the merge commit.
For example:
o---o---o---o---o master
\
o---o---o lucy
Generally, git ...