StackOverflow Questions for Tag: git-merge-conflict

sanmai

Reputation: 30881

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

gitgit-mergegit-merge-conflict

Score: 2103

Answers: 20

user21262497

Reputation:

unexpected commits records from another merged branch emerged after merging main on a branch

gitgit-mergegit-rebasegit-merge-conflict

Score: 1

Answers: 1

stucash

Reputation: 1258

Git Rebase Dilemma: Sort out the tangled feature branches

gitgit-mergegit-rebasegit-merge-conflict

Score: 1

Answers: 1

janou195

Reputation: 1205

How to have meld as git mergetool to only show conflict and not differences?

gitgit-merge-conflictmeld

Score: 16

Answers: 4

dsollen

Reputation: 6459

How to better merge changes in git when a module was split into two smaller files?

gitgit-mergegit-merge-conflict

Score: 2

Answers: 2

bogs7

Reputation: 21

How can I resolve merge conflicts in a Gerrit merge commit without redoing the entire merge process?

gitgit-mergegerritgit-merge-conflict

Score: 1

Answers: 1

Steve Bennett

Reputation: 125995

Smarter rebase avoiding redundant work (conflict resolution)?

gitgit-rebasegit-diffgit-merge-conflict

Score: 24

Answers: 4

Joymaker

Reputation: 1418

VS Code compare changes, how to accept/reject

visual-studio-codemergemerge-conflict-resolutiongit-merge-conflict

Score: 1

Answers: 0

Liqs

Reputation: 197

Is it possible to identify merge commits that had conflicts after the fact?

gitgit-mergegit-merge-conflict

Score: 4

Answers: 1

Milenko Markovic

Reputation: 71

How to solve yarn.lock deleted in HEAD and modified in parent conflict?

gitgit-merge-conflict

Score: 0

Answers: 0

xmedeko

Reputation: 7805

Git get theirs commit hash

gitgit-merge-conflict

Score: 2

Answers: 1

Steven Wexler

Reputation: 17269

Choose Git merge strategy for specific files ("ours", "mine", "theirs")

gitgit-rebasegit-merge-conflict

Score: 377

Answers: 5

Manish Kumar

Reputation: 10482

Can anyone help me to understand three window in Meld diff tool

gitgit-diffmeldgit-merge-conflict

Score: 2

Answers: 1

d.k

Reputation: 4460

Code disappears in target branch on git merge w/o any indication

gitgit-mergegit-diffgit-merge-conflict

Score: 0

Answers: 0

crooky m

Reputation: 23

Merging master into feature branch with conflict resolution

gitgit-mergegit-merge-conflict

Score: -1

Answers: 1

Eugen Konkov

Reputation: 25113

Is there a git option to show the parent line of a source code when merge conflict occurred?

gitgit-merge-conflict

Score: 0

Answers: 1

MHebes

Reputation: 3197

How do I auto-format master and feature branches without causing conflicts?

gitcode-formattingclang-formatgit-merge-conflict

Score: 0

Answers: 1

rhbc73

Reputation: 767

git merge conflict - common ancestor too old

gitazure-devopsgit-merge-conflict

Score: 0

Answers: 1

Ricardo Dias

Reputation: 21

Github Desktop not displaying merge conflicts interface

githubmerge-conflict-resolutiongit-merge-conflictgithub-desktop

Score: 2

Answers: 1

David Froger

Reputation: 665

git merge-file: how to incorporate conflicts into <base-file>?

gitgit-merge-conflict

Score: 2

Answers: 1

PreviousPage 1Next

StackOverflow Questions for Tag: git-merge-conflict

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

unexpected commits records from another merged branch emerged after merging main on a branch

Git Rebase Dilemma: Sort out the tangled feature branches

How to have meld as git mergetool to only show conflict and not differences?

How to better merge changes in git when a module was split into two smaller files?

How can I resolve merge conflicts in a Gerrit merge commit without redoing the entire merge process?

Smarter rebase avoiding redundant work (conflict resolution)?

VS Code compare changes, how to accept/reject

Is it possible to identify merge commits that had conflicts after the fact?

How to solve yarn.lock deleted in HEAD and modified in parent conflict?

Git get theirs commit hash

Choose Git merge strategy for specific files (&quot;ours&quot;, &quot;mine&quot;, &quot;theirs&quot;)

Can anyone help me to understand three window in Meld diff tool

Code disappears in target branch on git merge w/o any indication

Merging master into feature branch with conflict resolution

Is there a git option to show the parent line of a source code when merge conflict occurred?

How do I auto-format master and feature branches without causing conflicts?

git merge conflict - common ancestor too old

Github Desktop not displaying merge conflicts interface

git merge-file: how to incorporate conflicts into &lt;base-file&gt;?

Choose Git merge strategy for specific files ("ours", "mine", "theirs")

git merge-file: how to incorporate conflicts into <base-file>?