Top "Git-merge" questions

can't push to branch after rebase

We use git and have a master branch and developer branches. I need to add a new feature and then …

git merge rebase git-merge git-rebase

How do I resolve a conflict after git pull?

I have to solve some conflict after a git pull. $ git pull CONFLICT (rename/add): Renamed vignette_generator_mashed.h-&…

git conflict git-merge git-pull

Git merging one branch into another is a two way merge?

My git repo looks like this: _ branch_a / master / \_ branch_b Now I want to merge branch_b into branch_…

git merge git-merge meld

How to update my working Git branch from another branch (develop) ?

I made a new branch for my code like a month ago, I created feature1 branch from develop branch. ⇒ git …

git github branch git-merge

Resolve merge conflicts: Force overwrite all files

I am working on a git repository by myself (so yes, I know the implications and the warnings of doing …

git git-merge git-pull

git: merge two branches: what direction?

We have the following situation: A --- B --- C --- ... --- iphone / ... --- last-working --- ... --- master Between last-working …

git merge git-merge

how can I customize git's merge commit message?

Every time I do a merge I need for a merge commit to be generated and I would like it …

git git-merge

Why am I merging "remote-tracking branch 'origin/develop' into develop"?

I'm the only one in my organization who's making commits with the following message: Merge remote-tracking branch 'origin/develop' into …

git branching-and-merging git-merge git-remote

Merging without whitespace conflicts

I've got a problem where I've got a large commit which changes about a thousand lines of code, removing whitespace …

git whitespace git-merge

How to create a GitLab merge request via command line

We are working on integrating GitLab (enterprise edition) in our tooling, but one thing that is still on our wishlist …

gitlab git-merge