Question

Automatic resolution of merge conflicts on GitHub pull request page

score 45 · Answer 1 · 2024-03-12T14:41:07.583000

45

Views

Automatic resolution of merge conflicts on GitHub pull request page

Published on 12 March 2024 at 14:41

score 35 · Answer 2 · 2024-03-06T11:50:23.580000

35

Views

Can't resolve merge conflict in TortoiseGit

Published on 06 March 2024 at 11:50

score 58 · Answer 3 · 2024-02-23T08:54:32.520000

58

Views

Cant get merge conflict to appear locally but Azure devops says I have a conflict?

Published on 23 February 2024 at 08:54

score 32 · Answer 4 · 2024-02-12T14:46:00.153000

32

Views

Rebooting During Git Bash Rebase Operation

Published on 12 February 2024 at 14:46

score 37 · Answer 5 · 2024-02-08T16:15:25.880000

37

Views

Why is the BASE file generated by TortoiseGit in merge conflict resolution 0 bytes?

Published on 08 February 2024 at 16:15

score 46 · Answer 6 · 2024-02-07T16:21:22.553000

46

Views

In IntelliJ IDEA, can I switch branches in the middle of resolving merge conflicts and resume it later where I left off?

Published on 07 February 2024 at 16:21

score 58 · Answer 7 · 2024-02-06T11:15:27.247000

58

Views

Resolving merge conflict with several commits on a branch

Published on 06 February 2024 at 11:15

score 85 · Answer 8 · 2024-01-17T14:05:50.093000

85

Views

How to resolve git conflict locally (with some constraints)?

Published on 17 January 2024 at 14:05

score 54 · Answer 9 · 2023-12-20T07:57:18.430000

54

Views

How to Auto-Resolve Git Subtree Conflicts with Three-Way Merge Strategy?

Published on 20 December 2023 at 07:57

score 52 · Answer 10 · 2023-12-18T08:57:18.793000

52

Views

Automate Merge Conflicts in git

Published on 18 December 2023 at 08:57

score 237 · Answer 11 · 2023-11-27T06:08:22.990000

237

Views

How to set utf-8 as default encoding for pull request merge conflict extension in azure devops?

Published on 27 November 2023 at 06:08

score 88 · Answer 12 · 2023-11-20T11:23:38.930000

88

Views

Git conflicts between two protected branches

Published on 20 November 2023 at 11:23

score 62 · Answer 13 · 2023-11-01T14:57:19.147000

62

Views

Merging two protected branches in gitlab after squashing commits

Published on 01 November 2023 at 14:57

score 105 · Answer 14 · 2023-10-31T07:32:13.803000

105

Views

Why does git checkout --ours/theirs not work?

Published on 31 October 2023 at 07:32

score 73 · Answer 15 · 2023-10-30T20:23:11.593000

73

Views

Forcefully set files status as "unmerged" in a Git repository

Published on 30 October 2023 at 20:23

score 132 · Answer 16 · 2023-10-13T13:15:49.900000

132

Views

Git - how git merge works

Published on 13 October 2023 at 13:15

score 18 · Answer 17 · 2023-10-13T10:13:00.137000

18

Views

How to regularly merge a GIT repo A into repo B, and keep the merge conflicts to the minimum despite features differences?

Published on 13 October 2023 at 10:13

score 50 · Answer 18 · 2023-10-12T11:28:48.753000

50

Views

How to disable `npm-merge-drive` in git merge

Published on 12 October 2023 at 11:28

score 42 · Answer 19 · 2023-09-28T19:56:00.280000

42

Views

pulling from a repo is causing merge conflicts with 8 year old files, despite regularly pulling from this repo

Published on 28 September 2023 at 19:56

score 18 · Answer 20 · 2023-09-28T13:51:01.187000

18

Views

Issue installing nbdime

Published on 28 September 2023 at 13:51

List Question

Automatic resolution of merge conflicts on GitHub pull request page

Can't resolve merge conflict in TortoiseGit

Cant get merge conflict to appear locally but Azure devops says I have a conflict?

Rebooting During Git Bash Rebase Operation

Why is the BASE file generated by TortoiseGit in merge conflict resolution 0 bytes?

In IntelliJ IDEA, can I switch branches in the middle of resolving merge conflicts and resume it later where I left off?

Resolving merge conflict with several commits on a branch

How to resolve git conflict locally (with some constraints)?

How to Auto-Resolve Git Subtree Conflicts with Three-Way Merge Strategy?

Automate Merge Conflicts in git

How to set utf-8 as default encoding for pull request merge conflict extension in azure devops?

Git conflicts between two protected branches

Merging two protected branches in gitlab after squashing commits

Why does git checkout --ours/theirs not work?

Forcefully set files status as "unmerged" in a Git repository

Git - how git merge works

How to regularly merge a GIT repo A into repo B, and keep the merge conflicts to the minimum despite features differences?

How to disable `npm-merge-drive` in git merge

pulling from a repo is causing merge conflicts with 8 year old files, despite regularly pulling from this repo

Issue installing nbdime

Trending Questions

Popular # Hahtags

Popular Questions