Questions tagged [merge]
389 questions
112
votes
1 answer
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 up-to-date so that I won't have too many merge…
mnml
- 2,051
65
votes
10 answers
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 separate pages:
pdftk 1.pdf 2.pdf ... cat output…
Alex Reynolds
- 931
60
votes
1 answer
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 exist in both should normally be merged)! is that…
reox
- 1,005
58
votes
6 answers
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 copy or move a folder to somewhere it already…
cregox
- 5,944
56
votes
8 answers
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 mp4.
What alternatives are available (especially…
Paolo Bergantino
- 3,129
36
votes
3 answers
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 updated with the main project. I miss the…
bAN
- 1,776
35
votes
4 answers
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 move from one file to the other.
I'm looking for a…
Andreas Gohr
- 678
29
votes
2 answers
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 going into command line?
Jaroslav Záruba
- 1,148
24
votes
3 answers
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 column)? I use Mac, so I use LibreOffice and…
24
votes
7 answers
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 to each
other, with the…
Peter Smit
- 9,636
22
votes
2 answers
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 shows different files and equal files and…
Benjamin
- 2,399
21
votes
2 answers
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 etc. but of no use.
The two source PDFs have…
user600029
- 311
19
votes
8 answers
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 together, when instead I just want one merged cell per…
jlv
- 385
16
votes
7 answers
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.)
Chris
- 303
15
votes
5 answers
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 corresponding worksheets from each Excel file are…
lalabeans
- 153