Stack Overflow
Stack Overflow

Questions tagged [feature-branch]

139 questions
0
votes
2 answers

Workflow: git with feature branches, rebase, pull requests (not open-source project)

We have 5 developers in a team submitting pull requests regularly (daily) to master branch of a single repo. Typical workflow is like this: Clone repo from server Create local feature branch from master branch Make changes, commit, iterate until…
David Wasser
  • 93,459
  • 16
  • 209
  • 274
0
votes
0 answers

How to rebase effectively without letting commits pile up locally?

I'm trying to implement a workflow whereby I rebase my feature branch off master before merging it in. I've found that it's not a good idea to push my local commits on the feature branch to the remote repo before rebasing, as that essentially…
Matt Phillips
  • 9,465
  • 8
  • 44
  • 75
0
votes
2 answers

How do I merge my branchB of branchA into Master in Git?

I effectively have this: a -- b -- c <-- Master \ d -- e <-- BranchA \ f -- g -- H -- i <-- BranchB What I want is to integrate my changes…
Chucky
  • 1,701
  • 7
  • 28
  • 62
0
votes
0 answers

How to maintain proper merge order across feature branches?

How can the order of feature branches be preserved? For example, say that we have three feature branches: colby, swiss, and cheddar, which all must be merged into a dev branch. The order must be maintained as written, as each feature branch depends…
kmiklas
  • 13,085
  • 22
  • 67
  • 103
0
votes
2 answers

Git flow question, one feature branch depends on another

Git flow question, one feature branch depends on another. How should i correctly rebase the child feature branch after my parent feature branch merging to master? The git flow is shown below: At last I got duplicate commits in my child feature…
bhw1899
  • 87
  • 4
0
votes
1 answer

How do I safely merge to a remote branch on Github

For work I had to clone a repository. On my local repo I made some changes on the master branch. But now I need to make those same changes on a new feature branch in the remote repo. How do I do that without changing the master branch of the origin…
them8inchar
  • 83
  • 4
0
votes
2 answers

How to resolve merge conflicts in a monorepo?

Assume the following situation: the monorepo contains two artifacts in separate folders, say frontend and backend frontend developers are not capable of solving merge conflicts in backend code backend developers are not capable of solving merge…
Michael Hoff
  • 6,119
  • 1
  • 14
  • 38
0
votes
1 answer

how to remove git compare - + diff, the content is exact the same

I have a feature branch and created a merge request, in the compare section, it shows me: Pink is what dev branch looks like, green is my branch, the content on line 9 are exact the same, how can I modify my branch to make this diff disappear?
wawawa
  • 2,835
  • 6
  • 44
  • 105
0
votes
1 answer

Gitlab Option to create branch/merge request for issue automatically

Is there an option in GitLab which enables feature branch/merge request creation by default whenever an issue is created? I know it is possible to create them manually by clicking that fancy button on the issue page, but let's face it, we're lazy...
Robert Kirsten
  • 474
  • 2
  • 5
  • 12
0
votes
1 answer

How to make git create branches with names like `dev/feature/JIRA_KEY_Issue_name`?

I want to be able to create feature branches like dev/feature/JIRA_KEY_Issue_name. When I try to do it using git checkout -b dev/feature/JIRA_KEY_Issue_name, I get an error like this: fatal: cannot lock ref 'refs/heads/dev/feature/XXXXXXXXXXXXXXXX':…
Glory to Russia
  • 17,289
  • 56
  • 182
  • 325
0
votes
1 answer

After branching from FB, get GitHub PR to only show differences between FB and master

We have the following situation: master ------A X------------Y \ / \ / \ / \ / \ / \ / --B- \ / \ \…
Artie Leech
  • 347
  • 2
  • 14
0
votes
2 answers

Change parent branch to feature branch

I was working on a feature branch in this structure: a -- b -- c -- d <-- master \ \ \ e -- f <-- feature \ g <-- new_parent But I need to switch my branches to be in this way: a…
Frakcool
  • 10,915
  • 9
  • 50
  • 89
0
votes
1 answer

Selectively Deploy Feature Branches on Netlify

Following our process on BitBucket, we always create a feature branch named feature/JIRA-23-lost-password (JIRA-23-lost-password being just an example) from which we create several other branches per sub-task. I would like netlify to automatically…
Sammy
  • 3,395
  • 7
  • 49
  • 95
0
votes
2 answers

Merging and Deleting Feature Branch From Azure and Local Machine Repository

Here is the scenario I am the only developer in my team (stated to make it clear that there will be no change from other team members to consider) have a main branch stable and deployed on production server created a feature branch add some other…
Rai Arslan
  • 5
  • 6
0
votes
1 answer

When is it better to just work in one feature branch than creating multiple

Background I received the task to search for redundant jquery selectors in our code. Now, the files where our JS code is located is seperated into different modules. My supervisor gave me the task and told me that I should create a feature branch…
Beru
  • 657
  • 1
  • 6
  • 21
1 2 3
…
9 10