branching-and-merging

59 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Android Studio - unable to merge from SVN branch
user_32872040
•
17
2
4879
android-studio branching-and-merging intellij-idea svn android
Merge/Branch Strategy
user_4964190
•
8
2
10981
branching-and-merging tfs branch merge
Why would my local changes in Git be overwritten by checkout in this circumstance?
user_14774450
•
5
1
2505
branching-and-merging branch merge version-control git
Gerrit: working with multiple branches & propagating changes
user_7673830
•
7
2
10676
gerrit branching-and-merging branch merge
My git branch is showing 'origin/master' and 'origin/HEAD' in Sourcetree and I don't know how to merge the two
user_8178960
•
19
2
20843
branching-and-merging git
How can I recover from "fatal: Out of memory? mmap failed: Cannot allocate memory" in Git?
user_8137180
•
13
2
20028
branching-and-merging git
git merge fails with "Untracked working tree file" on case change
user_2141960
•
11
4
2703
case-insensitive branching-and-merging macos git
Git octopus merge order of multiple branches
user_1997870
•
40
1
25391
branching-and-merging git
git: merging a subtree from one branch to another
user_8094470
•
13
4
2986
branching-and-merging git
Why am I merging "remote-tracking branch 'origin/develop' into develop"?
user_3119010
•
152
3
104866
git-remote branching-and-merging git-merge git
Hot Questions