git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Git pre-merge-commit hook : How do I ignore a file during a merge?
user_135973840
•
2
3
919
githooks git-merge merge git
problem merging jupyter notebooks with nbdime
user_140982580
•
2
0
155
jupyter-notebook git-merge python git
how to use nbdime diffing and merging for jupyter notebooks in git bash
user_140982580
•
2
0
331
jupyter-notebook git-bash git-merge python git
Git file-level merge conflict caused by Git “suggesting [the file] should perhaps be moved”
user_3419940
•
5
1
1248
git-merge-conflict git-merge git
Force git pull to resolve divergent by discard all local commits?
user_72957610
•
3
1
473
git-merge-conflict git-merge git-pull git
How to solve the git revert conflict using tool?
user_128424290
•
1
0
123
revert git-merge version-control github git
Merge Branch into a Directory GIT
user_153840630
•
2
1
37
git-branch git-merge github git
Pull request showing changed files that are not actually changed
user_67279140
•
2
0
464
pull-request git-diff git-merge github git
Can't understand why git merge -s ours will ignore previous commits
user_95092060
•
3
2
88
git-merge git
Is there a way to disable squash and merge for certain branches in GitHub
user_15169540
•
20
1
1791
git-merge github git
Hot Questions