Questions tagged [merge]

13

votes

4

answers

Any gui for git merge (w squash)?

asked 2011-10-08T04:56:05.283

11

votes

3

answers

Sql Server Delete and Merge performance

sql-server t-sql merge sql-delete

asked 2011-10-02T13:48:02.967

17

votes

2

answers

Git push fails to github: failed to read object

ruby-on-rails git github merge git-fetch

asked 2011-09-21T00:17:29.583

23

votes

5

answers

How to zip two lists of lists

python list merge zip nested

asked 2011-09-19T17:15:43.310

9

votes

2

answers

merge command comparison between R and Stata

r merge stata

asked 2011-09-07T08:01:30.733

22

votes

2

answers

Git branches & commits history after merge

git merge branch

asked 2011-09-01T18:43:52.427

9

votes

2

answers

What are the underlying git merge processes within the staging area?

git merge

asked 2011-08-17T14:42:22.160

18

votes

4

answers

R: merge two irregular time series

r datetime merge time-series zoo

asked 2011-08-17T07:52:42.140

18

votes

7

answers

Merging 2 dictionaries having duplicate keys with linq

c# linq dictionary merge

asked 2011-08-01T19:13:20.407

151

votes

3

answers

How do I combine two data-frames based on two columns?

r merge dataframe

asked 2011-07-15T15:07:53.507

19

votes

1

answers

Oracle -- WITH CLAUSE => MERGE? (Syntax error, )

oracle-database merge with-statement ora-00928 subquery-factoring

asked 2011-07-13T03:39:31.090

32

votes

4

answers

Git: merge only the changes made on the branch

git version-control merge branch git-branch

asked 2011-07-06T10:23:41.683

69

votes

9

answers

Dictionary merge by updating but not overwriting if value exists

python dictionary merge compare

asked 2011-06-15T07:29:57.210

10

votes

2

answers

MySQL: Trying to populate data into one column from another table

mysql sql merge

asked 2011-05-27T20:51:42.397

9

votes

1

answers

Mercurial hg merge default

mercurial merge rebase

asked 2011-05-11T16:29:21.787

61

votes

4

answers

Undo a git merge (hasn't been pushed yet)

git merge revert

asked 2011-05-10T14:04:16.183

10

votes

4

answers

combine two jquery select statements

jquery select merge

asked 2011-05-10T13:30:29.430

9

votes

1

answers

Merging issues in Redmine

merge redmine issue-tracking redmine-plugins

asked 2011-04-27T15:44:34.237

54

votes

5

answers

Trouble merging upstream changes back into my branch

git merge commit conflict partial

asked 2011-04-24T20:00:27.747

32

votes

6

answers

Merging a list of time-range tuples that have overlapping time-ranges

python algorithm merge

asked 2011-04-15T16:21:08.407

11

votes

5

answers

Sox : merge two audio files with a pad

audio merge delay sox pad

asked 2011-04-07T20:22:16.353

43

votes

2

answers

How to merge two columns in R with a specific symbol?

r merge symbols

asked 2011-04-05T22:47:47.603

150

votes

5

answers

Are there any downsides to enabling git rerere?

git merge git-rerere

asked 2011-04-01T21:50:05.360

11

votes

5

answers

How do I merge SSIS package files?

version-control merge dvcs ssis

asked 2011-03-29T05:10:36.293

36

votes

2

answers

Merging multiple branches with git

git merge rebase

asked 2011-03-13T20:33:11.523

10

votes

4

answers

How can I merge two redundant records in a MySQL table, maintaining all PK/FK relationships?

php mysql merge foreign-keys redundancy

asked 2011-03-08T19:00:39.767

15

votes

2

answers

Use of Mercurial hg bundle and hg export vs merging?

mercurial merge

asked 2011-03-02T15:28:19.097

9

votes

3

answers

JavaScript Merge Intersecting Rectangles

javascript algorithm merge intersection

asked 2011-03-02T07:02:41.620

27

votes

2

answers

How to set a columnspan in tableLayoutPanel

c# winforms merge tablelayoutpanel columnspan

asked 2011-03-01T07:21:03.590

34

votes

8

answers

Context-aware merge?

merge diff cvs semantic-analysis

asked 2011-02-21T15:32:36.070

86

votes

8

answers

Algorithm for N-way merge

algorithm merge

asked 2011-02-20T07:55:23.203

10

votes

1

answers

Merge into with multiple updates and inserts

sql sql-server t-sql sql-server-2008 merge

asked 2011-01-24T16:57:05.140

288

votes

5

answers

Rebasing a Git merge commit

git merge rebase git-rebase git-rewrite-history

asked 2011-01-24T15:15:11.967

11

votes

5

answers

how to efficiently merge int ranges in a stream?

algorithm merge stream

asked 2011-01-20T14:16:41.947

14

votes

2

answers

How can I save an incompletely merged index in git?

git merge patch

asked 2011-01-07T16:06:35.103

9

votes

5

answers

Using Ant to merge two different properties files

ant build merge properties

asked 2011-01-05T04:48:01.083

21

votes

2

answers

mercurial -- "merge" by abandoning one changeset

mercurial merge

asked 2010-12-06T23:43:41.777

78

votes

4

answers

git partial merge, not whole branch

git merge

asked 2010-11-30T16:23:10.553

22

votes

4

answers

Can I do an atomic MERGE in Oracle?

java oracle-database concurrency merge weblogic

asked 2010-11-19T16:05:00.193

11

votes

3

answers

How do I use `git rebase -i` after `git merge` without messing things up?

git merge rebase

asked 2010-11-11T09:29:04.877

62

votes

3

answers

Merge Git branch without commit log

git merge

asked 2010-11-08T10:38:39.087

10

votes

3

answers

What determines the speed of an SVN 1.6 merge operation

performance svn merge

asked 2010-11-03T09:52:43.233

9

votes

3

answers

Merge and transpose multiple flat associative arrays into a 2d array with null values where column values are missing

php arrays multidimensional-array merge transpose

asked 2010-11-01T19:24:00.120

16

votes

2

answers

How to block a changeset from merging in TFS?

version-control tfs merge

asked 2010-10-26T14:52:07.770

41

votes

4

answers

Undo an hg push (backout?)

mercurial merge tortoisehg

asked 2010-09-21T23:25:27.430

31

votes

5

answers

How to merge branch back to trunk in SVN with all commit history?

svn merge

asked 2010-08-20T14:47:39.770

50

votes

2

answers

Git Merge - Incomplete, Missing files and Folders

git file merge pull

asked 2010-08-12T23:28:47.297

10

votes

2

answers

Possible to simulate the mySQL functionality ON DUPLICATE KEY UPDATE with SQL Server

sql sql-server sql-server-2008 concurrency merge

asked 2010-07-26T22:47:55.423

16

votes

2

answers

Mercurial - When to use update

mercurial merge

asked 2010-06-23T16:27:47.290

14

votes

2

answers

SVN Working Copy to Different Branch Merge Without Commit to Working Copy Branch

svn merge working-copy

asked 2010-05-25T14:14:40.683

Questions tagged merge