git-merge-conflict

54 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Avoiding conflicts in git when merging a squashed commit from main into feature branch
user_18000520
•
2
1
298
git-merge-conflict git-squash branching-and-merging git-merge git
Git merge conflict: Cannot find the problem
user_96054330
•
3
2
2203
jupyter-notebook git-merge-conflict git-log git-pull git
Gitlab says there are merge conflicts, but actually there are none
user_2789100
•
2
2
7730
gitlab git-merge-conflict git-merge git
How can I find the upstream commit hash that caused a specific conflict?
Admin1
•
2
3
205
git-merge-conflict merge 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
Cannot cherry-pick commit changing not-existing file
user_150621030
•
2
2
608
git-merge-conflict cherry-pick git
Is there a way to see commit hash instead of HEAD?
user_46320190
•
2
1
71
git-merge-conflict git
Git partial merge conflict resolve in a file with vimdiff
user_78114730
•
3
1
220
git-merge-conflict vimdiff vim git
Can I mark a file for resolution without adding it to the index with one command?
user_58252940
•
2
1
434
git-index git-stage git-merge-conflict git-add git
Hot Questions