branching-and-merging

59 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 - Revert changes made by merge without destroying recent additions to the same files
user_74057940
•
1
1
36
branching-and-merging git
How to trigger a pipeline when new branch is created
user_138128300
•
2
1
917
azure-devops azure git-branch branching-and-merging
Git - How to change the starting point of a git branch with existing PR?
user_109213860
•
3
2
125
git-branch branching-and-merging rebase github git
Only move last n commits to other branch
user_101601740
•
2
1
75
git-branch branching-and-merging git
Azure Devops Pull Request - Prevent a user approving request if they have worked on the branch
user_32235070
•
3
2
1560
devops pull-request azure-devops branching-and-merging
How do I save configuration files in different branches of Mercurial?
user_104236040
•
3
2
97
branching-and-merging merge mercurial
Github problem: Git pushes to master branch, not main and can't merge the two
user_101083040
•
3
2
6298
branching-and-merging github git
Calculate how different a git branch is from master?
user_183330
•
3
1
62
atlassian-sourcetree bitbucket branching-and-merging branch git
How to rebase a branch after its base branch was rebased on master
user_10038860
•
6
4
2246
branching-and-merging rebase branch git
Hot Questions