git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
How do I squash commits in one branch while keeping them in the other?
user_27120500
•
4
1
948
git-workflow git-rebase git-merge git
Difference between git pull, git fetch+merge and git rebase
user_33373910
•
4
3
5563
git-rebase git-merge git-pull git
Git: Pulling changes into a newly cloned bare repository from an existing (similar) repository
user_24526170
•
3
1
54
git-bare git-merge git-pull git
How to resolve a git conflict by keeping all additions from both sides?
user_58244890
•
7
2
5316
git-merge-conflict merge-conflict-resolution git-rebase git-merge git
Gitlab Merge Request:- Ignore few files while merging
user_23583030
•
2
1
9256
gitlab git-merge git
Git - Cherry picking with ours/theirs strategy
user_10841740
•
10
1
14362
merge-conflict-resolution cherry-pick commit git-merge git
Git keep some local changes clean but do not push them
user_42704710
•
6
6
2719
git-stash git-merge git
Git: switch branches mid-merge
user_36423980
•
9
2
5678
git-merge git
Is it possible to sign-off a Merge Commit in Git?
user_14783150
•
5
5
4957
atlassian-sourcetree git-merge git
How can I merge the last two commits?
user_52595940
•
17
2
14164
git-rebase git-merge git
Hot Questions