I performed multiple merge commits but they should have been merge --squash instead. The conflict resolution took more than a day so I can't afford to redo the merging by hand. Is there a way to c...

I'm working on a project in VS code. I made changes, pulled from GitHub and got merge conflicts. I don't know what i did but my merge conflict screen now looks like this (it's highlighting the file...

I'm trying to implement merge sort but somehow have been stuck for a day. [Sorry for pasting a big amount of code but wouldn't be able to do without it] Implementation: Merge Sort - Function int me...

I have a branch master and a branch feature which was checked out from master. master gets commits pushed into it from other developers and I regularly merge master back into feature, so that it k...

I have two data frames that I am trying to merge. Dataframe A: col1 col2 sub grade 0 1 34.32 x a 1 1 34.32 x b 2 1 34.33 y c 3 2 10.14 z b 4 3 33.01 z a Dataframe B: col1 col2 group ID 0 1 ...

When merging branches with --squash, git does no longer seem to be able to determine whether a branch has been fully merged. How can I quickly check this with existing git commands? To reproduce, ...

A high quality open source repo exists on GitHub and NPM, with a wide user base. I've forked the project and made a substantial extension. I think is ready to merge back. But (appropriately) its t...

I wanted to know if there was a way to verify if a value in one df that was being Concatenated with another existed in both dfs or the other df as well prior to stacking them on top of each other??...

I want to insert a char into a list. However, I want to merge this char with the last symbol in the list. With appends and cons the result is always two different symbols. Well, I want one merged s...

Is it possible to merge the props of two generic object types? I have a function similar to this: function foo<A extends object, B extends object>(a: A, b: B) { return Object.assign({}, a, ...

I begun a workflow where I aim to do all new features in a development branch and the master branch will only be for production ready code. After doing the following: git checkout master git merg...

I have a feature-branch which is from master some time back. Now, master branch has advanced and feature-branch has many sub-branches on top of it. I want to have all the new changes from master br...

I'm updating a Postgres 8.4 database (from C# code) and the basic task is simple enough: either UPDATE an existing row or INSERT a new one if one doesn't exist yet. Normally I would do this: UPDAT...

I've been wrestling with this for a while. I have a table which is automatically generated based on some JSON data, which may vary. I'd like to merge neighbouring cells in the first column which ha...

After getting changes from a different branch using rebase, I'm trying to push the new changes to a remote private branch and I'm getting the following message Push of the current branch XXXX was ...

I have a project with a dev branch and a production branch. Recently I've been working on a big new set of features in dev, so I haven't merged into production for about two weeks. In the meantime,...

Background info: Due to restrictions in workflow with out existing systems, we need to set up a somewhat unorthodox git process. (patch) A-B---F | | (hotfix) C-D-E | (dev) 1-2-3-G On the pa...

How can I install Meld on MacOS, and then set it up as my difftool and mergetool in git?

I have a bunch of sorted lists of objects, and a comparison function class Obj : def __init__(p) : self.points = p def cmp(a, b) : return a.points < b.points a = [Obj(1), Obj(3), Obj(8), .....

While trying to remove duplicate phone numbers from a relatively large list I recently combined, Google Sheets presented me with this error message: There was a problem. Your selection contains...

I have checked out the trunk from one of our svn repos. I then right click -> merge -> merge some revisions -> merge from branch A -> choose one revision and then finally apply the merge. My Tort...

On my branch I had some files in .gitignore On a different branch those files are not. I want to merge the different branch into mine, and I don't care if those files are no longer ignored or not...

I need to merge multiple dictionaries, here's what I have for instance: dict1 = {1:{"a":{"A"}}, 2:{"b":{"B"}}} dict2 = {2:{"c":{"C"}}, 3...

I have a local branch features that I based off of my local master to add some stuff in my code. I am now ready to merge those back into master , however, the state of the remote master branch has ...

The environment: We use Bitbucket Cloud for repository management (and merges) and Jenkins for CI/CD. Branches with open pull requests are built and deployed to a temporary environment (which inclu...