git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Is git pull --rebase the same as git pull when no work is done on the local master branch?
user_88256830
•
3
1
1718
git-rebase git-merge git-pull merge git
Why did this revert fail?
user_713760
•
3
1
1775
git-branch git-revert git-merge git
what is the difference between a Git-merge and Git-cherry-pick for a specific commit?
user_42480830
•
8
3
3264
git-cherry-pick git-merge git
How to detect whether a git merge would result in an empty commit, given two arbitrary commits?
user_884090
•
3
1
345
libgit2sharp is-empty git-merge git
How to run a build, when there is merge request from feature to master branch in GitLab before accepting the merge request
user_92178170
•
2
1
272
gitlab jenkins-pipeline jenkins git-merge
Xcode can't merge feature branch back into master branch "The source control operation failed because the file ___ could not found
user_103502470
•
3
1
1085
xcode git-merge git
How to solve merge conflict in a approved review in gerrit?
user_103198260
•
10
2
19975
gerrit merge-conflict-resolution git-merge
Git Merge by file type
user_278760
•
2
2
819
git-merge git
Constant conflicts when using mergerequests and releasenotes in git
user_9668520
•
3
1
669
merge-conflict-resolution git-merge git
Recovering lost changes after reverting bad merge
user_14588470
•
4
1
2067
git-revert git-merge git
Hot Questions