git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Visual Studio 2022: is it possible to do a git merge without auto commit?
stefano_m_192610
•
4
1
2332
visual-studio-2022 git-merge merge
GitHub Actions: On a push-to-master workflow, how can I get a link to the pull request which was merged?
user_8541510
•
3
1
2230
github-actions pull-request git-merge
How to use git merge driver, union?
user_2056960
•
7
0
411
git-merge build-automation git
Git error while merging even though all the changes are pushed with No merge conflict
user_118375840
•
2
0
151
bitbucket jenkins git-merge git
Update github branch from another branch
user_177792360
•
1
1
272
updates git-branch git-merge version-control github
What is/was the default git divergent merge strategy?
user_68374450
•
2
3
3409
git-config default git-merge git-pull git
PR from release to main has conflicts
user_182994250
•
1
1
225
git-flow merge-conflict-resolution git-merge git
Automatically let git open custom merge tool for certain extensions
user_7360790
•
2
0
116
mergetool git-merge git
Git Squash Merge on two branches making a mess
user_85147720
•
6
1
403
git-merge github git
Possible issue after doing `Squash and Merge`?
user_180344640
•
1
1
492
branching-and-merging git-merge github git
Hot Questions