git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Does the direction or order of a merge/rebase make a difference?
user_1482980
•
2
4
585
git-merge rebase github git
Git Merge ignores files that were reverted from develop but added on feature branch
user_27248140
•
3
1
82
pull-request git-merge git
How/why does git rebase avoid a merge commit?
Admin1
•
7
5
4949
git-rebase git-merge git
Why does GitLab say there are conflicts when there have not been commits to the target branch since the last merge?
user_3753990
•
11
1
4258
gitlab merge-conflict-resolution git-merge git
git reset --soft - does it go back to git checkout point or to the last git merge point?
Admin1
•
3
2
184
git-reset git-checkout git-merge git
Moving Git branch with history to new repo
user_1116240
•
5
1
1642
git-remote git-rebase git-merge git
Does git merge add all commits or only last commit?
user_61471820
•
3
2
1954
git-merge merge git
Git custom merge driver with fallback to the built-in driver
user_3870760
•
2
1
668
git-merge-conflict git-merge git
Squash Git Mirror Commits
user_44795850
•
3
1
243
gitlab mirroring git-merge github git
Any example to use git merge patience strategy?
user_14707850
•
5
3
1136
git-diff diff git-merge git
Hot Questions