tagged [merge]
Oracle: how to UPSERT (update or insert into a table?)
Oracle: how to UPSERT (update or insert into a table?) The UPSERT operation either updates or inserts a row in a table, depending if the table already has a row that matches the data: Since Oracle doe...
Undo a merge by pull request?
Undo a merge by pull request? Someone accepted a pull request which they shouldn't have. Now we have a bunch of broken code merged in. How do you undo a pull request? I was just going to revert the ch...
- Modified
- 6 Jan at 02:4
Merging arrays with the same keys
Merging arrays with the same keys In a piece of software, I merge two arrays with `array_merge` function. But I need to add the same array (with the same keys, of course) to an existing array. The pro...
- Modified
- 4 May at 09:39
git stash -> merge stashed change with current changes
git stash -> merge stashed change with current changes I made some changes to my branch and realized I forgot I had stashed some other necessary changes to said branch. What I want is a way to merge m...
Why am I getting tree conflicts in Subversion?
Why am I getting tree conflicts in Subversion? I had a feature branch of my trunk and was merging changes from my trunk into my branch periodically and everything was working fine. Today I went to mer...
- Modified
- 3 Dec at 08:49
Merging 2 dictionaries having duplicate keys with linq
Merging 2 dictionaries having duplicate keys with linq How to merge 2 dictionaries of `IDictionary` where `MyObject` is a class instance? ``` IDictionary d1 = new Dictionary(); d1.Add(guid1, m1); d1.A...
- Modified
- 21 Nov at 06:30
Merge development branch with master
Merge development branch with master I have two branches namely `master` and `development` in a GitHub Repository. I am doing all my development in development branch as shown. Now I want to merge all...
Git merge develop into feature branch outputs "Already up-to-date" while it's not
Git merge develop into feature branch outputs "Already up-to-date" while it's not I checked out a feature branch from develop called `branch-x`. After a while other people pushed changes to the develo...
How to cherry-pick a range of commits and merge them into another branch?
How to cherry-pick a range of commits and merge them into another branch? I have the following repository layout: - - - What I want to achieve is to cherry-pick a range of commits from the working bra...
- Modified
- 23 Aug at 08:31
Python Pandas merge only certain columns
Python Pandas merge only certain columns Is it possible to only merge some columns? I have a DataFrame df1 with columns x, y, z, and df2 with columns x, a ,b, c, d, e, f, etc. I want to merge the two ...
Git merge reports "Already up-to-date" though there is a difference
Git merge reports "Already up-to-date" though there is a difference I have a git repository with 2 branches: master and test. There are differences between master and test branches. Both branches have...
How can I preview a merge in git?
How can I preview a merge in git? I have a git branch (the mainline, for example) and I want to merge in another development branch. Or do I? In order to decide whether I really want to merge this bra...
Merging dictionaries in C#
Merging dictionaries in C# What's the best way to merge 2 or more dictionaries (`Dictionary`) in C#? (3.0 features like LINQ are fine). I'm thinking of a method signature along the lines of: or ``` pu...
- Modified
- 19 Dec at 11:56
Efficiently merge string arrays in .NET, keeping distinct values
Efficiently merge string arrays in .NET, keeping distinct values I'm using .NET 3.5. I have two string arrays, which may share one or more values: I'd like a way to merge them into one array with no d...
How to merge a branch into trunk?
How to merge a branch into trunk? I'm facing a peculiar problem with SVN `merge`. I want to merge from a dev branch to trunk. We have multiple dev branches cut off the trunk at the same time. I'm merg...
- Modified
- 23 Jan at 20:15
Error while loading project: Attribute Include is unrecognized
Error while loading project: Attribute Include is unrecognized After merging two branches the Visual Studio has suddenly problems with loading a project. When I try to reload, I always get the error >...
- Modified
- 26 Sep at 13:10
Visual Studio Code how to resolve merge conflicts with git?
Visual Studio Code how to resolve merge conflicts with git? I tried to merge my branch with another branch and there was a merge conflict. In Visual Studio Code (version 1.2.1) I resolved all of the i...
- Modified
- 6 Jul at 04:56
merging 2 dataframes vertically
merging 2 dataframes vertically I have 2 dataframes that have 2 columns each (same column names). I want to merge them vertically to end up having a new dataframe. When doing The new df has only the ...
Git merge error "commit is not possible because you have unmerged files"
Git merge error "commit is not possible because you have unmerged files" I forgot to `git pull` my code before editing it; when I committed the new code and tried to push, I got the error "push is not...
pandas three-way joining multiple dataframes on columns
pandas three-way joining multiple dataframes on columns I have 3 CSV files. Each has the first column as the (string) names of people, while all the other columns in each dataframe are attributes of t...
INSERT IF NOT EXISTS ELSE UPDATE?
INSERT IF NOT EXISTS ELSE UPDATE? I've found a few "would be" solutions for the classic "How do I insert a new record or update one if it already exists" but I cannot get any of them to work in SQLite...
- Modified
- 12 Nov at 09:17
How to update my working Git branch from another branch (develop)?
How to update my working Git branch from another branch (develop)? I made a new branch called `feature1` from the main `develop` branch a month ago. I've been working on `feature1` for a month now and...
Subversion: Fail update when there are conflicts?
Subversion: Fail update when there are conflicts? Is there a way to tell subversion "update/merge unless it would cause a conflict"? I know you can use `--dry-run` / `status -u` to check before runnin...
- Modified
- 29 Aug at 01:36