Questions about branching-and-merging
Read more about branching-and-merging
python (65.1k questions)
javascript (44.2k questions)
reactjs (22.7k questions)
java (20.8k questions)
c# (17.4k questions)
html (16.3k questions)
r (13.7k questions)
android (12.9k questions)
Branching and release strategy - A best option to bring changes between develop to release branch
We are redefining the way we move commits from dev branch to prod branch. We are mostly following Kanban based approach where stories comes in develop it, move to QA, stays at QA and then moves to pre...
kbvishnu
Votes: 0
Answers: 1
"Re-parenting" GIT feature branch based on another
I am hoping someone knows the git-fu required to untangle a branch mess.
I have a feature branch - FB2 - whose parent is FB1, which in turn originated from master.
Bad news: I need to retarget FB2 on ...
looselycoupled
Votes: 0
Answers: 1
How not to have pull requests from one team member on GitHub overwrite my own CSS file?
Currently, I'm working on a PHP project with three team members on GH. We split up tasks, but came to the conclusion that when contributor1 codes one screen and styles it in our CSS file, this will al...
Rix11
Votes: 0
Answers: 1
When I merge my release branch into main, and then into dev to incorporate the changes there, my dev says it's X commits ahead, X commits behind. Why?
I'm following the gitflow branching model. I follow the guidelines quite closely.
I create a release branch from dev, and make final bugfixes and adjustments there
I then merge this into main, and th...
Milind Sharma
Votes: 0
Answers: 1