git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Git rebase and squash on branch that has merges from master?
user_9306400
•
2
1
160
git-rebase git-merge git
git merge equivalent of git rebase --onto
user_128543720
•
3
2
855
merge-conflict-resolution git-rebase git-merge rebase git
Can I merge the commits made to a fork back to the original project?
user_42722020
•
5
3
1215
git-commit git-merge git
How do I accept git merge conflicts from "their" branch for only a certain directory?
user_45618870
•
5
3
2870
git-merge merge git
Are git tags merged?
user_19110910
•
11
4
8274
git-tag git-merge git
Why do I suddenly have a merge commit in my pushes?
user_7223930
•
4
1
1115
team-explorer git-commit git-revert git-merge git
Git reporting a merge conflict, but hunks are identical
user_8769370
•
2
1
216
vim-fugitive merge-conflict-resolution vimdiff git-merge git
Skip files while merging git branches in both directions
user_15923500
•
2
1
217
gitattributes git-merge git
Big git merge - split resolution across commits
user_131961900
•
2
1
229
merge-conflict-resolution git-merge git
Xcode: How to exclude Pods and Target Support Files when merging branches?
user_87289190
•
2
0
136
xcode git-merge git
Hot Questions