StackOverflow Questions for Tag: git-merge

crazybyte

Reputation: 10599

How to cherry-pick a range of commits and merge them into another branch?

gitgit-mergegit-cherry-pick

Score: 916

Answers: 12

abyss.7

Reputation: 14462

What is `git merge` doing?

gitgit-mergemerge-conflict-resolution

Score: 139

Answers: 5

user29678557

Reputation: 1

How to Exclude Specific Files from a GitLab Merge Request After Accidentally Merging Deployment Branch Configs?

gitgit-mergegit-workflow

Score: 0

Answers: 0

Eki Eqbal

Reputation: 6057

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

gitgithubbranchgit-merge

Score: 149

Answers: 10

user2690051

Reputation: 307

Merge two similar Git repositories into new repo

gitgit-merge

Score: 5

Answers: 1

JeanDujardin

Reputation: 302

git pull VS git pull --no-rebase

gitgit-mergegit-rebasegit-pull

Score: 8

Answers: 3

nougako

Reputation: 243

How to establish a branching relationship between an older commit of one branch with another unrelated branch

gitgit-merge

Score: 0

Answers: 2

ontherocks

Reputation: 1999

Gitlab says there are merge conflicts, but actually there are none

gitgitlabgit-mergegit-merge-conflict

Score: 7

Answers: 4

patrick

Reputation: 923

How to create a GitLab merge request via command line

gitlabgit-merge

Score: 92

Answers: 12

sanmai

Reputation: 30911

Resolve Git merge conflicts in favor of their changes during a pull

gitgit-mergegit-merge-conflict

Score: 2106

Answers: 20

seg.server.fault

Reputation: 20018

Undo Git pull. How to bring repositories to the old state

gitversion-controlgit-merge

Score: 1485

Answers: 19

CalebK

Reputation: 707

Bring back a branch to be fast-forward merged again

gitgithubgit-mergefast-forward

Score: -2

Answers: 2

Andrew Grimm

Reputation: 81621

How can I determine what commits cause a conflict?

gitgit-mergegit-merge-conflict

Score: 2

Answers: 1

KekmasterACR

Reputation: 154

Git merge does not update target branch with all changes from source

gitmergegit-merge

Score: 0

Answers: 0

Daraan

Reputation: 3947

Keep handled conflicts when rebasing a repository including complete non-linear history

gitgit-mergerebasegit-rebase

Score: -2

Answers: 1

am9417

Reputation: 1036

Show only unmerged files and their states when resolving a merge conflict in Git

gitgit-merge

Score: 0

Answers: 0

keerthi-vasan-k

Reputation: 5

How to merge accidently missed release into current branch

gitgit-mergebranching-and-merging

Score: -2

Answers: 1

Angad

Reputation: 1124

Git squash/merge feature into develop

gitgithubgit-mergegit-rebase

Score: -3

Answers: 1

Satyam Pandit

Reputation: 1

Gitlab must execute either one of the 2 job groups and succeed if all jobs in the executing job group succeeds

gitlabyamlpipelinegit-mergecicd

Score: 0

Answers: 0

marcamillion

Reputation: 33775

.gitignore and "The following untracked working tree files would be overwritten by checkout"

gitgit-mergegitignore

Score: 1048

Answers: 33

PreviousPage 1Next

StackOverflow Questions for Tag: git-merge

How to cherry-pick a range of commits and merge them into another branch?

What is `git merge` doing?

How to Exclude Specific Files from a GitLab Merge Request After Accidentally Merging Deployment Branch Configs?

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

Merge two similar Git repositories into new repo

git pull VS git pull --no-rebase

How to establish a branching relationship between an older commit of one branch with another unrelated branch

Gitlab says there are merge conflicts, but actually there are none

How to create a GitLab merge request via command line

Resolve Git merge conflicts in favor of their changes during a pull

Undo Git pull. How to bring repositories to the old state

Bring back a branch to be fast-forward merged again

How can I determine what commits cause a conflict?

Git merge does not update target branch with all changes from source

Keep handled conflicts when rebasing a repository including complete non-linear history

Show only unmerged files and their states when resolving a merge conflict in Git

How to merge accidently missed release into current branch

Git squash/merge feature into develop

Gitlab must execute either one of the 2 job groups and succeed if all jobs in the executing job group succeeds

.gitignore and &quot;The following untracked working tree files would be overwritten by checkout&quot;

.gitignore and "The following untracked working tree files would be overwritten by checkout"