git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Is there a way to cleanly and easily undo a git merge?
user_78872180
•
3
3
1313
git-reset git-revert git-merge git
How to check if two branches changed the same line (automatically)
user_84364650
•
2
1
119
git-merge git
Where does the common ancestor of merged commits reside in Git (when there's criss-cross merge)?
user_50068800
•
4
2
221
git-merge git
Synchronize corresponding directories in two repositories (to achieve access control)
user_166730
•
4
1
126
access-control git-merge git
How to git merge unrelated history pre Git 2.9 (--allow-unrelated-histories isn't available)
user_687590
•
2
1
151
git-merge git
Generate list of all Merge Requests merged between two tags with all informations in csv file
user_144422550
•
3
2
667
gitlab export-to-csv pretty-print git-log git-merge
How to automatically rebase all children branches onto master after squashing and merging the parent branch?
user_144381030
•
4
1
890
git-squash git-rebase git-merge git
Why does merging from a particular GitHub repository into a local Git repository result in uncommitted changes in the local repository?
user_25096140
•
2
1
1502
git-fetch git-merge github git
Github still shows differences between branches after sucessfull merge
user_23044090
•
8
2
1681
git-merge github git
Resolve only part of merge conflict in larger team
user_106313750
•
2
1
280
git-merge merge git
Hot Questions