StackOverflow Questions for Tag: merge-strategy

tanager

Reputation: 189

How can I merge changes which git believes it already has (due to 'strategy ours' merge)?

gitmergemerge-strategy

Score: 0

Answers: 1

benjimin

Reputation: 4900

Git cherrypick and rebase onto a different history to sync a directory

gitmerge-strategy

Score: -2

Answers: 1

frankieee

Reputation: 13

Ignoring files that are not present in the destination branch when merging a source branch into it with git

gitgitignoreconflictmerge-strategy

Score: 0

Answers: 1

Nishant Jain B18CSE067

Reputation: 39

Change merge strategy from 'ort' to 'recursive'

gitmergegit-mergemerge-strategy

Score: 1

Answers: 2

Nancy Hsu

Reputation: 11

k8s - multiple ownerrefs in CRDs

kuberneteskubernetes-custom-resourcesmerge-strategy

Score: 1

Answers: 0

Aila

Reputation: 329

Are there any git merge-strategies for ignoring submodule updates on a commit or branch merge into target branch?

gitgithubmergegit-submodulesmerge-strategy

Score: 14

Answers: 2

Andre M

Reputation: 7554

Git and forcing to accept changes from other branch

gitgit-mergemerge-strategy

Score: 2

Answers: 1

Praveen Raghav

Reputation: 39

git should give me operation as conflict when same file modified in different branches

gitgit-mergegit-merge-conflictmerge-strategy

Score: 1

Answers: 1

Waqas Tahir

Reputation: 8252

Override merge without loosing commits in Git

gitgit-mergemerge-strategy

Score: 0

Answers: 0

soosita

Reputation: 187

Assembly scala project causes deduplicate errors

scalasbtsbt-assemblymerge-strategy

Score: 1

Answers: 1

Karol Selak

Reputation: 4774

Replace whole state of application with state of another commit

gitcherry-pickmerge-strategy

Score: 1

Answers: 3

canceriandebu

Reputation: 11

Pull Request Flow

bitbucketbranching-strategybitbucket-cloudmerge-strategy

Score: -2

Answers: 1

Elia Weiss

Reputation: 9975

How to merge branch in git using `their` when in conflict

gitgit-mergegit-merge-conflictmerge-strategy

Score: 2

Answers: 1

Mohammad H

Reputation: 805

How to use THEIRS git merge strategy in android studio?

gitmergemerge-strategy

Score: -2

Answers: 1

Sriks

Reputation: 1699

GitLab - ignore specific files in target branch

gitgitlabgit-mergemerge-strategy

Score: 1

Answers: 1

CodeHunter

Reputation: 11

Git - Automatically Merge

gitmergemerge-strategy

Score: 1

Answers: 1

Jason Nicholas

Reputation: 93

Make All Merges Manual in Git

gitmergemanualmerge-strategy

Score: 1

Answers: 1

LeonardChallis

Reputation: 7783

Why is my Git ours merge strategy being ignored?

gitmerge-strategy

Score: 0

Answers: 1

PreviousPage 1Next

StackOverflow Questions for Tag: merge-strategy

How can I merge changes which git believes it already has (due to &#39;strategy ours&#39; merge)?

Git cherrypick and rebase onto a different history to sync a directory

Ignoring files that are not present in the destination branch when merging a source branch into it with git

Change merge strategy from &#39;ort&#39; to &#39;recursive&#39;

k8s - multiple ownerrefs in CRDs

Are there any git merge-strategies for ignoring submodule updates on a commit or branch merge into target branch?

Git and forcing to accept changes from other branch

git should give me operation as conflict when same file modified in different branches

Override merge without loosing commits in Git

Assembly scala project causes deduplicate errors

Replace whole state of application with state of another commit

Pull Request Flow

How to merge branch in git using `their` when in conflict

How to use THEIRS git merge strategy in android studio?

GitLab - ignore specific files in target branch

Git - Automatically Merge

Make All Merges Manual in Git

Why is my Git ours merge strategy being ignored?

How can I merge changes which git believes it already has (due to 'strategy ours' merge)?

Change merge strategy from 'ort' to 'recursive'