StackOverflow Questions for Tag: branching-and-merging

mtjhax
mtjhax

Reputation: 1997

How does one work on a new git branch that depends on another git branch that is not yet merged?

Score: 34

Views: 7107

Answers: 3

Read More
MagMax
MagMax

Reputation: 2729

How to change current branch in git from master to main

Score: 40

Views: 83699

Answers: 4

Read More
keerthi-vasan-k
keerthi-vasan-k

Reputation: 5

How to merge accidently missed release into current branch

Score: -2

Views: 72

Answers: 1

Read More
oneworld
oneworld

Reputation: 791

How to proactively enforce branch naming convention in GitHub?

Score: 1

Views: 192

Answers: 1

Read More
Claudiu
Claudiu

Reputation: 229521

How can I delete all local branches which would result in no changes if merged into master?

Score: 10

Views: 1834

Answers: 3

Read More
Ahmed Yasser
Ahmed Yasser

Reputation: 1

Merging multiple branches all of the starting from the same starting point

Score: 0

Views: 31

Answers: 0

Read More
sanjay Paudel
sanjay Paudel

Reputation: 39

Branch Protection Rule on GitHub

Score: 2

Views: 2767

Answers: 2

Read More
moe
moe

Reputation: 29764

How do I safely merge a Git branch into master?

Score: 2698

Views: 2343939

Answers: 17

Read More
Kalyan
Kalyan

Reputation: 1

gitlab backout changes from one env to another env

Score: 0

Views: 27

Answers: 0

Read More
Hardik3296
Hardik3296

Reputation: 458

How to restrict merging options on github

Score: 1

Views: 319

Answers: 2

Read More
WFHStitchWitch
WFHStitchWitch

Reputation: 1

How do I get back to a branch checkout if Pycharm says I need to move or remove untracked working tree files?

Score: 0

Views: 35

Answers: 0

Read More
Chetan Sachdev
Chetan Sachdev

Reputation: 718

Github - fetch all forks of a cloned git repo and add as Remote origin

Score: 4

Views: 74

Answers: 1

Read More
ojosilva
ojosilva

Reputation: 2094

How to know if a branch has been squashed into another

Score: 2

Views: 1863

Answers: 3

Read More
ErrorAndTrial
ErrorAndTrial

Reputation: 1

Delete and stop tracking folders from client branch but keep them on main product branch

Score: 0

Views: 35

Answers: 1

Read More
Patrick
Patrick

Reputation: 3440

With Git, how do I remove a local copy of a remote branch? Or at least pull without merging?

Score: 18

Views: 23452

Answers: 3

Read More
halloleo
halloleo

Reputation: 10464

How merge everything into origin/master and get rid of origin/main?

Score: 0

Views: 47

Answers: 0

Read More
SterlingVix
SterlingVix

Reputation: 321

In Bitbucket, what is an "active" branch, what is the impact of many "active" branches?

Score: 7

Views: 7255

Answers: 3

Read More
Zachary Berkowitz
Zachary Berkowitz

Reputation: 25

GitHub: Merge pull request manually, as automatic merging would overwrite important changes

Score: 0

Views: 36

Answers: 0

Read More
madlep
madlep

Reputation: 49766

How do I copy a version of a single file from one Git branch to another?

Score: 1417

Views: 665297

Answers: 9

Read More
Mark A. Nicolosi
Mark A. Nicolosi

Reputation: 85631

Move the most recent commit(s) to a new branch with Git

Score: 6694

Views: 1915866

Answers: 24

Read More
PreviousPage 1Next