Question

Git. What to do, when origin and local branch diverged and merge didnt go well?

score 39 · Answer 1 · 2024-03-22T09:43:18.093000

39

Views

Git. What to do, when origin and local branch diverged and merge didnt go well?

Published on 22 March 2024 at 09:43

score 38 · Answer 2 · 2024-03-05T06:09:38.980000

38

Views

Why is cherry picking trying to apply past commits?

Published on 05 March 2024 at 06:09

score 32 · Answer 3 · 2024-02-29T14:14:19.653000

32

Views

Merge dev to stage but only specific commits

Published on 29 February 2024 at 14:14

score 59 · Answer 4 · 2024-02-02T21:49:24.913000

59

Views

Octokit.net - Cherry-pick merge commit

Published on 02 February 2024 at 21:49

score 104 · Answer 5 · 2023-11-25T16:19:17.597000

104

Views

How to append commits of unrelated branches?

Published on 25 November 2023 at 16:19

score 73 · Answer 6 · 2023-11-15T07:00:45.237000

73

Views

how to keep diverged form of a merged commit in a cherry-pick?

Published on 15 November 2023 at 07:00

score 336 · Answer 7 · 2023-11-10T21:59:04.510000

336

Views

How to prepare release branches with trunk-based development cherry-pick release strategy

Published on 10 November 2023 at 21:59

score 93 · Answer 8 · 2023-10-20T20:19:38.110000

93

Views

git cherry-pick results in unmerged commits?

Published on 20 October 2023 at 20:19

score 26 · Answer 9 · 2023-10-05T17:55:56.150000

26

Views

unable to see the changed files in git from branchA in new BranchB

Published on 05 October 2023 at 17:55

score 143 · Answer 10 · 2023-09-11T14:47:53.717000

143

Views

Cherry-pick commits from different branches into the master branch

Published on 11 September 2023 at 14:47

score 70 · Answer 11 · 2023-08-21T02:20:09.630000

70

Views

Do you know why this cherry-pick makes code diff?

Published on 21 August 2023 at 02:20

score 76 · Answer 12 · 2023-08-16T15:41:37.437000

76

Views

Use git log entries to create release notes, without stumbling into cherry picks

Published on 16 August 2023 at 15:41

score 1.5k · Answer 13 · 2023-07-04T12:58:16.883000

1.5k

Views

Visual Studio 2022 stuck on cherry pick GIT when nothing to commit

Published on 04 July 2023 at 12:58

score 170 · Answer 14 · 2023-06-28T05:57:51.213000

170

Views

Git cherry-pick is disabled in Visual Studio 2017

Published on 28 June 2023 at 05:57

score 87 · Answer 15 · 2023-06-12T22:32:03.840000

87

Views

git cherry-pick seems to picks up two commits from a single hash

Published on 12 June 2023 at 22:32

score 49 · Answer 16 · 2023-05-31T08:36:06.447000

49

Views

git cherrypicking with merged commits

Published on 31 May 2023 at 08:36

score 77 · Answer 17 · 2023-05-13T04:08:48.580000

77

Views

Can git cherry picking last commit from throw-away branch damage the history in branch where data will be moved to?

Published on 13 May 2023 at 04:08

score 118 · Answer 18 · 2023-05-03T21:07:29.093000

118

Views

How can git log --cherry-pick be parallelized?

Published on 03 May 2023 at 21:07

score 56 · Answer 19 · 2023-04-28T16:19:01.403000

56

Views

Is there any way to see which commit is cherry-picked to a commit?

Published on 28 April 2023 at 16:19

score 481 · Answer 20 · 2023-04-27T23:27:02.917000

481

Views

Can I use rebase to update my feature branch to avoid polluting my commits even if the pull request may go stale?

Published on 27 April 2023 at 23:27

List Question

Git. What to do, when origin and local branch diverged and merge didnt go well?

Why is cherry picking trying to apply past commits?

Merge dev to stage but only specific commits

Octokit.net - Cherry-pick merge commit

How to append commits of unrelated branches?

how to keep diverged form of a merged commit in a cherry-pick?

How to prepare release branches with trunk-based development cherry-pick release strategy

git cherry-pick results in unmerged commits?

unable to see the changed files in git from branchA in new BranchB

Cherry-pick commits from different branches into the master branch

Do you know why this cherry-pick makes code diff?

Use git log entries to create release notes, without stumbling into cherry picks

Visual Studio 2022 stuck on cherry pick GIT when nothing to commit

Git cherry-pick is disabled in Visual Studio 2017

git cherry-pick seems to picks up two commits from a single hash

git cherrypicking with merged commits

Can git cherry picking last commit from throw-away branch damage the history in branch where data will be moved to?

How can git log --cherry-pick be parallelized?

Is there any way to see which commit is cherry-picked to a commit?

Can I use rebase to update my feature branch to avoid polluting my commits even if the pull request may go stale?

Trending Questions

Popular # Hahtags

Popular Questions