Question

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

score 2.9k · Answer 1 · 2015-06-23 05:01:58

2.9k

Views

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

Published on 23 June 2015 at 05:01

score 213 · Answer 2 · 2020-10-23 16:35:52

213

Views

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

Published on 23 October 2020 at 16:35

score 77 · Answer 3 · 2023-10-23 07:10:09

77

Views

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

Published on 23 October 2023 at 07:10

score 415 · Answer 4 · 2014-06-09 13:43:14

415

Views

Why is my Git ours merge strategy being ignored?

Published on 09 June 2014 at 13:43

score 80 · Answer 5 · 2018-07-30 07:23:26

80

Views

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

Published on 30 July 2018 at 07:23

score 98 · Answer 6 · 2014-07-31 19:12:19

98

Views

Make All Merges Manual in Git

Published on 31 July 2014 at 19:12

score 862 · Answer 7 · 2020-05-24 10:27:30

862

Views

Assembly scala project causes deduplicate errors

Published on 24 May 2020 at 10:27

score 193 · Answer 8 · 2021-12-03 06:02:13

193

Views

k8s - multiple ownerrefs in CRDs

Published on 03 December 2021 at 06:02

score 5.7k · Answer 9 · 2017-07-11 00:47:13

5.7k

Views

GitLab - ignore specific files in target branch

Published on 11 July 2017 at 00:47

score 33 · Answer 10 · 2021-03-30 13:18:25

33

Views

Override merge without loosing commits in Git

Published on 30 March 2021 at 13:18

score 529 · Answer 11 · 2015-11-28 20:23:25

529

Views

Git - Automatically Merge

Published on 28 November 2015 at 20:23

score 1.8k · Answer 12 · 2019-04-07 21:38:14

1.8k

Views

Git and forcing to accept changes from other branch

Published on 07 April 2019 at 21:38

score 53 · Answer 13 · 2019-04-10 08:41:56

53

Views

Pull Request Flow

Published on 10 April 2019 at 08:41

score 48 · Answer 14 · 2024-02-17 00:14:25

48

Views

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

Published on 17 February 2024 at 00:14

score 397 · Answer 15 · 2018-03-12 13:49:38

397

Views

How to use THEIRS git merge strategy in android studio?

Published on 12 March 2018 at 13:49

score 17 · Answer 16 · 2024-03-12 14:41:07

17

Views

Automatic resolution of merge conflicts on GitHub pull request page

Published on 12 March 2024 at 14:41

score 2.9k · Answer 17 · 2022-09-13 10:18:42

2.9k

Views

Change merge strategy from 'ort' to 'recursive'

Published on 13 September 2022 at 10:18

score 218 · Answer 18 · 2019-05-19 14:06:45

218

Views

Replace whole state of application with state of another commit

Published on 19 May 2019 at 14:06

List Question

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

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

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

Why is my Git ours merge strategy being ignored?

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

Make All Merges Manual in Git

Assembly scala project causes deduplicate errors

k8s - multiple ownerrefs in CRDs

GitLab - ignore specific files in target branch

Override merge without loosing commits in Git

Git - Automatically Merge

Git and forcing to accept changes from other branch

Pull Request Flow

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

How to use THEIRS git merge strategy in android studio?

Automatic resolution of merge conflicts on GitHub pull request page

Change merge strategy from 'ort' to 'recursive'

Replace whole state of application with state of another commit

Trending Questions

Popular # Hahtags

Popular Questions