git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
git: Commit staged changes (without merge conflicts) during merge
user_70464410
•
2
1
254
git-stage git-merge-conflict git-commit git-merge git
Automatic rebase to drop a commit that modifies a file?
user_50385030
•
2
1
118
git-rewrite-history git-commit git-merge rebase git
How to declare a git branch as merged without adopting the changes in it?
user_15930770
•
2
3
208
idioms git-merge branch git
How to get your merge request up2date in gitlab?
user_86271800
•
2
1
46
gitlab git-merge git
How to squash commits that contain a merge commit
user_53932860
•
2
1
2044
git-squash squash git-merge git
Creating a Yocto layer from a merge between two repositories
user_141035520
•
2
1
229
yocto git-merge
Ability to "break glass" and bypass Github branch protection for emergency fixes?
user_10137810
•
5
3
1923
developer-tools git-merge github git
Merge HEAD to master
user_144488810
•
2
2
612
git-merge merge git
GIT define simple conflict-resolving strategy
user_71325500
•
2
1
38
git-merge-conflict merge-conflict-resolution git-merge git
Git how to merge without a merge commit, but preserving hashes (to have a straight graph line in the git log)
user_43427780
•
2
1
882
git-merge git
Hot Questions