Question

Git merge strategies vs. merge drivers vs. mergetools

score 37 · Answer 1 · 2024-03-29T19:03:05.313000

37

Views

Git merge strategies vs. merge drivers vs. mergetools

Published on 29 March 2024 at 19:03

score 21 · Answer 2 · 2024-03-13T15:14:08.243000

21

Views

Gitlab. Always conflicts, but no differences in files

Published on 13 March 2024 at 15:14

score 56 · Answer 3 · 2024-02-22T02:12:50.773000

56

Views

Git cant create pull request | different commit histories | bfg --delete-files | git merge --allow-unrelated-histories

Published on 22 February 2024 at 02:12

score 43 · Answer 4 · 2024-02-15T13:37:27.827000

43

Views

TortoiseGit stuck in "merge mode", cannot restore pull option in menu

Published on 15 February 2024 at 13:37

score 48 · Answer 5 · 2024-02-06T02:59:01.620000

48

Views

How can I fix a merge conflict from the Github website?

Published on 06 February 2024 at 02:59

score 48 · Answer 6 · 2024-01-22T15:00:49.403000

48

Views

GitFlow for feature split in sub branches

Published on 22 January 2024 at 15:00

score 46 · Answer 7 · 2024-01-19T23:57:05.720000

46

Views

Git Conflict Resolution Challenge: How to restore last saved code after conflicts

Published on 19 January 2024 at 23:57

score 44 · Answer 8 · 2024-01-19T08:05:52.107000

44

Views

Best way to resolve conflict between feature and test branch but without affect the main?

Published on 19 January 2024 at 08:05

score 85 · Answer 9 · 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 10 · 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 56 · Answer 11 · 2023-10-31T20:09:10.280000

56

Views

Keep file as deleted in git merge (script)

Published on 31 October 2023 at 20:09

score 116 · Answer 12 · 2023-10-18T13:55:12.967000

116

Views

git reports merge conflict although files are the same

Published on 18 October 2023 at 13:55

score 68 · Answer 13 · 2023-10-18T05:57:03.963000

68

Views

Detect conflicts before merging files that will cause conflicts in the future

Published on 18 October 2023 at 05:57

score 134 · Answer 14 · 2023-10-17T14:21:50.160000

134

Views

git: How automatically merge non-conflicting changes in the same file?

Published on 17 October 2023 at 14:21

score 159 · Answer 15 · 2023-10-17T03:39:54.950000

159

Views

Git manual merge with binary files using propriety merge tool. How does git mergetool work?

Published on 17 October 2023 at 03:39

score 83 · Answer 16 · 2023-10-01T18:45:02.720000

83

Views

Merge Conflict is not showing up on VS Code

Published on 01 October 2023 at 18:45

score 31 · Answer 17 · 2023-09-25T07:37:29.967000

31

Views

IntelliJ doesn't show code comparison when selecting Resolve conflicts

Published on 25 September 2023 at 07:37

score 151 · Answer 18 · 2023-09-08T09:22:03.940000

151

Views

Git simple conflicts automatic resolution

Published on 08 September 2023 at 09:22

score 48 · Answer 19 · 2023-08-18T05:00:26.020000

48

Views

Github: Why revising a csv file in a branch results in a conflicting merge?

Published on 18 August 2023 at 05:00

score 396 · Answer 20 · 2023-08-09T12:44:08.020000

396

Views

VS Code Merge Editor doesn't get populated

Published on 09 August 2023 at 12:44

List Question

Git merge strategies vs. merge drivers vs. mergetools

Gitlab. Always conflicts, but no differences in files

Git cant create pull request | different commit histories | bfg --delete-files | git merge --allow-unrelated-histories

TortoiseGit stuck in "merge mode", cannot restore pull option in menu

How can I fix a merge conflict from the Github website?

GitFlow for feature split in sub branches

Git Conflict Resolution Challenge: How to restore last saved code after conflicts

Best way to resolve conflict between feature and test branch but without affect the main?

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

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

Keep file as deleted in git merge (script)

git reports merge conflict although files are the same

Detect conflicts before merging files that will cause conflicts in the future

git: How automatically merge non-conflicting changes in the same file?

Git manual merge with binary files using propriety merge tool. How does git mergetool work?

Merge Conflict is not showing up on VS Code

IntelliJ doesn't show code comparison when selecting Resolve conflicts

Git simple conflicts automatic resolution

Github: Why revising a csv file in a branch results in a conflicting merge?

VS Code Merge Editor doesn't get populated

Trending Questions

Popular # Hahtags

Popular Questions