Questions tagged [merge]

24

votes

2

answers

Should I merge .pbxproj files with git using merge=union?

asked 2010-04-28T11:50:37.970

40

votes

6

answers

What do the different columns (of letters) mean for the svn merge output?

svn merge

asked 2010-04-14T01:24:28.460

71

votes

2

answers

syntax for single row MERGE / upsert in SQL Server

sql-server merge upsert

asked 2010-03-19T17:57:13.300

32

votes

5

answers

Missing ranges error message when reintegrating a branch into trunk in Subversion 1.5

svn merge branch trunk svn-reintegrate

asked 2010-03-18T18:02:49.680

11

votes

4

answers

Svn merging trunk and branches

svn merge branch trunk

asked 2010-03-09T15:40:35.407

37

votes

5

answers

Can I update a branch from the trunk without performing a merge?

svn merge branch ankhsvn trunk

asked 2010-03-03T15:17:00.217

9

votes

5

answers

Merge trunk into branch with SVN: "Secure Connection Truncated"

svn merge connection security truncated

asked 2010-02-24T06:46:40.673

19

votes

8

answers

Merge two exe files into one programmatically

merge exe code-injection

asked 2010-02-15T19:52:50.923

13

votes

4

answers

How to rebase one repo to another

git version-control merge repository

asked 2010-02-11T20:27:14.723

52

votes

8

answers

How to identify conflicting commits by hash during git rebase?

git merge git-rebase

asked 2010-01-22T15:40:39.197

116

votes

5

answers

How to conclude your merge of a file?

git merge

asked 2010-01-21T21:27:56.997

9

votes

5

answers

Can I pull only certain files from another git repository?

git branch merge git-branch

asked 2010-01-20T19:51:59.003

33

votes

2

answers

Use WinMerge as TortoiseHG Merge tool

mercurial merge tortoisehg winmerge

asked 2010-01-15T17:30:34.833

10

votes

3

answers

python list of dicts how to merge key:value where values are same?

python list merge dictionary

asked 2010-01-14T21:15:38.507

14

votes

4

answers

Merging multiple javascript files

javascript performance merge

asked 2009-12-23T02:51:51.453

29

votes

6

answers

Java aware merge command

java git merge

asked 2009-11-29T22:02:44.243

13

votes

2

answers

Reintegrate a branch with externals fails in SVN

svn merge svn-externals

asked 2009-11-19T15:15:45.647

19

votes

4

answers

Push elements from one array into rows of another array (one element per row)

php multidimensional-array merge append array-push

asked 2009-10-13T05:10:21.580

22

votes

2

answers

How can 2 Python dictionaries become 1?

python merge dictionary

asked 2009-10-11T20:24:08.820

30

votes

3

answers

Subversion marks unmodified files as modified

svn merge

asked 2009-09-30T08:54:53.150

38

votes

3

answers

How to merge two branches without a common ancestor?

git merge rebase

asked 2009-09-28T18:56:55.337

18

votes

3

answers

TFS: Merging back into main branch

tfs branch merge

asked 2009-09-16T17:24:29.720

2350

votes

29

answers

How do you merge two Git repositories?

git merge repository git-subtree

asked 2009-09-15T08:31:54.643

98

votes

8

answers

git merge: Removing files I want to keep!

git merge branch

asked 2009-09-10T20:47:54.690

21

votes

3

answers

How to merge transparent PNG with image using PHP?

php image merge resize png

asked 2009-09-08T13:32:40.630

18

votes

2

answers

TFS merge change set to main branch

tfs merge branch

asked 2009-08-25T11:40:27.103

50

votes

3

answers

Git: Merge to master while automatically choosing to overwrite master files with branch

git merge branch

asked 2009-08-18T16:54:41.483

15

votes

9

answers

git: how do I merge between branches while keeping some changesets exclusive to one branch?

git version-control branch dvcs merge

asked 2009-08-17T15:03:39.697

13

votes

10

answers

Merge sorted lists in python

python arrays merge sorting

asked 2009-07-21T09:21:00.210

55

votes

6

answers

SVN - unable to merge branch back into trunk - numerous tree-conflicts

svn merge tree-conflict

asked 2009-06-17T18:06:57.467

9

votes

2

answers

Use 'pull' or 'merge' to merge local branches?

git merge branch pull

asked 2009-06-02T13:12:48.067

54

votes

7

answers

How to back up private branches in git

git merge workflow rebase dropbox

asked 2009-05-29T01:01:06.700

46

votes

21

answers

How do I correct "Commit Failed. File xxx is out of date. xxx path not found."

svn merge commit

asked 2009-05-04T12:32:48.733

16

votes

6

answers

php array_merge without erasing values?

php arrays merge

asked 2009-04-27T13:22:27.877

24

votes

2

answers

How to branch and merge in TFS

tfs branch merge

asked 2009-04-23T21:51:26.003

96

votes

4

answers

SVN how to resolve new tree conflicts when file is added on two branches

svn merge tree-conflict

asked 2009-04-20T10:49:25.803

12

votes

4

answers

Commits and merges on SVN subdirectories considered harmful?

svn merge tortoisesvn svn-merge

asked 2009-04-16T20:05:05.877

32

votes

4

answers

Can git-svn correctly populate svn:mergeinfo properties?

svn git merge git-svn

asked 2009-04-03T16:03:02.057

20

votes

3

answers

Msys Git Merge Tool Command Options Issue

git version-control merge batch-file

asked 2009-03-11T20:34:54.797

442

votes

23

answers

Git merge reports "Already up-to-date" though there is a difference

git merge

asked 2009-03-11T13:36:54.130

44

votes

3

answers

Merging two IEnumerable<T>s

c# merge

asked 2009-02-26T15:21:30.387

9

votes

2

answers

How can I configure Mercurial to use WinMerge for merges, under cygwin?

mercurial merge cygwin winmerge

asked 2009-02-14T05:01:07.397

38

votes

6

answers

How do I merge a CVS branch into HEAD using the Eclipse merge tools?

java eclipse merge cvs

asked 2009-02-09T22:02:03.547

11

votes

3

answers

Orphaned Branches in TFS

tfs version-control merge branch

asked 2009-02-03T15:45:24.227

9

votes

4

answers

How can I merge PDF files with Perl?

perl pdf merge

asked 2009-01-07T05:03:55.863

81

votes

4

answers

Merge trunk to branch in Subversion

svn merge

asked 2008-12-30T06:43:01.530

469

votes

4

answers

When would you use the different git merge strategies?

git merge git-merge

asked 2008-12-14T19:12:11.860

107

votes

4

answers

How can I combine hashes in Perl?

perl dictionary hash merge

asked 2008-12-08T16:13:20.270

31

votes

13

answers

How do I merge two python iterators?

python merge iterator

asked 2008-10-28T16:07:12.883

20

votes

10

answers

Tools for SVN Merging

svn merge

asked 2008-10-20T11:00:49.767

Questions tagged merge