git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Git merge with a single dash
user_20523630
•
6
4
150
git-merge git
How to merge master branch into main
user_32251090
•
15
1
14943
git-merge github git
Show git log for a file from a specific branch
user_5292560
•
2
3
305
git-merge git
Prevent modifying file on main branch in GitHub
user_30752100
•
2
2
342
git-merge github git
How to merge feature branches into master so that new changes also reflected
user_148656890
•
2
2
98
git-merge github git
Avoiding conflicts in git when merging a squashed commit from main into feature branch
user_18000520
•
2
1
298
git-merge-conflict git-squash branching-and-merging git-merge git
Gitlab says there are merge conflicts, but actually there are none
user_2789100
•
2
2
7730
gitlab git-merge-conflict git-merge git
Undo Published Merge and Re-Apply Original Changes Without History Rewrite
user_98931140
•
3
1
116
revert git-revert git-merge merge git
Git merge from another branch - 3 different methods - will all work correctly?
user_25611810
•
3
2
129
git-fetch git-merge git-pull git
Branch is ahead of origin by more than one commit after merge
user_88478710
•
5
1
932
git-branch git-merge git
Hot Questions