git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
How to manage local files in git, prevent merge to master
user_14073150
•
2
0
35
atlassian-sourcetree gitignore git-merge git
Git alias to squash feature-branch commits
user_30647360
•
2
3
396
git-alias git-squash git-merge git
How to determine which parent is the first one for a merge commit in Git
user_24983270
•
4
3
574
git-commit git-merge git
How can Dependabot automatically merge its pull requests based on Azure pipelines build status?
user_81631750
•
3
0
580
dependabot-script dependabot git-merge github
Is it possible to merge after cherry-pick and rebase?
user_80249260
•
4
1
139
git-cherry-pick git-merge-conflict git-rebase git-merge git
Can I squash a merge commit with one of its predecessors?
user_4979340
•
4
2
318
git-rewrite-history git-merge git
Is there a way to merge branches on GitHub via pull requests with different and enforced merge strategies?
user_8284990
•
6
2
646
pull-request git-merge merge github git
Git: How to merge feature branch into master using VS Code source control?
user_56998110
•
12
1
20946
visual-studio-code git-merge branch merge git
Impossible to merge branch: refusing to merge unrelated histories
user_67413100
•
3
2
5208
git-fetch git-merge github git
What happens in git when you merge unrelated histories?
user_99472090
•
4
1
387
git-merge merge git
Hot Questions