All Questions
33 questions
1
vote
1
answer
45
views
Why is Gitflow release operation doing so many actions in Bitbucket
I learned that release action in GitFlow is merely a merge develop branch (latest update) to the release/XXX branch with a TAG on it.
I would like to do simply as following:
git checkout -b release/...
- 11
0
votes
0
answers
50
views
Resolving conflicts in Bitbucket Automatic merge failure PRs
The repository has Automatic branch merging set up to automatically merge changes from branch release/1.0 to release/2.0 upon PR merges on release/1.0. release/2.0 already has feature B code that ...
- 171
0
votes
0
answers
221
views
What is the correct process for merging hotfix changes into multiple release branches (ie: dev/staging)?
I'm wondering what is the correct way of getting a hotfix into various main release branches which ensures Git history for these branches are more aligned and Git history is consistent?
I have the ...
- 16.7k
1
vote
2
answers
1k
views
Should I test master branch before put into production?
I'm working with git flow and a doubt arouse about the master branch. I have development and user acceptance working on develop branch and when I finish the test, I merge the develop with master ...
0
votes
0
answers
80
views
I need help trying to replicate the flow I follow when using Github on Bitbucket
I have both accounts and projects on both services. I try to replicate my Github flow on bitbucket projects but so far it has not been possible. The git management is the same, but the issues or ...
- 1,411
2
votes
1
answer
4k
views
Automatic merge back to develop in BitBucket
I previously worked on a project using the Gitflow Workflow and BitBucket. When a PR was merged into a release branch then it was automatically merged back into develop.
This does not happen in ...
- 157
0
votes
0
answers
602
views
How to prevent a Pull Request Merge to break the build?
Currently working on a gitflow branching strategy on git, bamboo and bitbucket.
I am new to gitflow (coming from github flow) so bare with me.
At the moment, I've set it up in a way that my builds are ...
- 33
0
votes
1
answer
2k
views
`git flow release finish` does not merge code in `master` branch on remote repo
Initially I am cloning a Git repo to my local and then doing:
git flow init .
I am able to successfully create feature branch and merge to develop by creating pull request.
Now I use:
git flow ...
- 3
0
votes
1
answer
81
views
Why auto merge don't work in bitbacket on this case?
I made such config for branch model
After i made release branch and merge it to develop via pull request:
i was expected auto merge for develop to master but nothig happend.
25
votes
2
answers
84k
views
Git: How to cherrypick commit from one branch and create pull request for another branch?
I have two branches dev & master. I am using bitbucket.
I need to cherrypick some of the commit from dev branch.
Then need to create pull request for the master branch.
As my dev environment has ...
- 387
1
vote
1
answer
1k
views
Master and develop branch never synced even follow git-flow process in bitbucket
I am following git-flow branching model with my repo hosted on Bitbucket Cloud.
contributions are done to feature branches (branched out from develop) which are merged into develop branch via PRs
...
- 870
1
vote
1
answer
242
views
New branches not appearing on Bitbucket
I have a repository on Bitbucket under Mercurial. As Bitbucket not supporting Mercurial (or almost not supporting) I change Mercurial to Git by reimporting repository.
Now when I create a release ...
- 6,227
1
vote
2
answers
4k
views
How to rebase via pull request in Bitbucket
Our team uses Bitbucket for collaboration and we have enabled pull-request workflow for master and develop branches. This means these two branches become read-only and cannot be pushed to. They can ...
- 1,841
6
votes
2
answers
4k
views
How delete a local branch after merging it through a pull request? git-flow, bitbucket, sourcetree
My environment in local:
Git connecting with Bitbucket
Sourcetree with git-flow
Steps
I create a feature x in Sourcetree then I add the code.
I do a commit including the option to create a pull ...
- 646
0
votes
1
answer
5k
views
using sourcetree and gitflow to do a release
I am new to using sourcetree and my repository is in bitbucket.
If i am using the git-flow to do release do i need to have write permission on both master and develop because when i click the finish ...
- 2,259
1
vote
1
answer
968
views
How to execute git pull command automatically from server using post-receive script
I have a working tree stored in the bitbucket server and it has a git-flow enabled. I have 2 branches which are develop (staging) and master (production). Staging and production are stored in a ...
- 229
1
vote
1
answer
197
views
Best Git workflow for Sitecore
Sitecore is a content management system that my company uses. We have three environments: Dev, Stage, and prod. we are using BitBucket with SourceTree (using gitflow workflow) for most of our ...
- 33
1
vote
1
answer
1k
views
Fixing merge conflicts with git flow
I'm using the following flow: There's master, test and feature branches. Feature branches are branched from master. Pull requests are made from feature branches to test and then (when approved) from ...
- 318
1
vote
1
answer
461
views
Git revert with multiple Merges
We have a repo with submodules, usually when creating a pull request we do it to develop but in one of our submodules we don't use develop, instead we use develop-build the problem is that develop-...
- 128
0
votes
1
answer
380
views
Bitbucket - How to enforce that merges are done first to Develop branch and then to Master branch?
Gitflow workflow states that Hotfix branches will be merged to both Develop and Master branches.
Since engineers forgot more than once to merge their hotfix to Develop, I want to mandate that the ...
- 660
1
vote
2
answers
634
views
SourceTree - flags:ERROR short flag required for (showcommands) on this platform
I am using SourceTree for macOS for a git-repository. I created feature on git-flow and I completed. When I try to make it as "Finish Feature" I am getting this error message:
flags:ERROR short flag ...
- 1,571
-1
votes
1
answer
1k
views
Git Flow for multiple teams
We have a situation regarding branches and versioning. e.g. We have a master branch with 2.0 version, now what it gets complicated is we have three teams working on the same project but in different ...
- 17
0
votes
4
answers
742
views
Git approach for multiple repo's with 99% the same code
We have a project (it's Drupal, but I don't believe this can influence the answer) which we have to deploy to 6 countries. Nothing fancy about that.
But here's the catch. All 6, let's call it "...
- 8,055
0
votes
2
answers
2k
views
How can I create a master branch from my develop branch in BitBucket/Git?
I built a site in a branch called 'develop' to meet internal requirements for pushing to our development server.
I now need to push the developed project into the master branch which is currently ...
- 1,560
2
votes
1
answer
2k
views
Git Push Unable to Create Directory Error
When I try to push a branch that has a slash / such as used commonly in git flow I get the following error:
(env)➜ api git:(release/0.15) git push --set-upstream origin release/0.15
Total 0 (delta 0)...
- 33.5k
0
votes
1
answer
184
views
Git - how to properly revert changes?
We just recently switched to git (using the gitflow branching model) and are having some trouble when we need to back out changes.
Unfortunately, we fairly often decide that a feature won't be going ...
- 3,017
1
vote
1
answer
4k
views
Follow GitFlow Hotfix pattern with Bitbucket Pull Requests
I can't figure out how I can configure Bitbucket to handle Hotfixes the GitFlow way via one Pull Request (PR).
What I would like is:
Submit a hotfix PR (to merge into master (production) branch).
...
- 11
0
votes
2
answers
4k
views
Git flow with Bitbucket pull requests
I used git flow feature finish to finish a feature branch. I use the AVH fork of git-flow, which deletes the remote feature branch - but the Bitbucket pull request is still open. How should I close ...
- 33k
4
votes
0
answers
861
views
Is there a way to force people use git-flow by restricting direct commits to the master branch or something similar?
I was wondering if there is any way to force people to use git-flow and let them push only if they are working under the git-flow patter? just to avoid developers to push directly to the master branch....
- 5,838
4
votes
2
answers
457
views
Feature branches in remote not getting deleted
I'm having an issue with using git-flow. Not sure if this is the expected behavior so please clarify it for me.
I create an empty repo in Bitbucket and clone it to my local machine. Then I create an ...
- 31.2k
1
vote
1
answer
724
views
Git Workflow leads to Unsyncronized Branches on Bitbucket
I am fairly new to Git, get my ways around it though and basiclly everything is working the way I want it to be working. I just now ran into an issue involving Git, Bitbucket and the often cited "...
- 123
1
vote
1
answer
2k
views
HgFlow and multiple developers
I really like the Hg Flow for Mercurial repositories. we are currently using Bitbucket, and in each product multiple developers are working. basically they can work as below:
a team might work on a ...
- 3,729
12
votes
2
answers
3k
views
Merge-only Branch on BitBucket/GitLab/GitHub?
Is there a way of setting up a branch such that it can only be merged into, rather than pushed into? Furthermore, is there any way that works on BitBucket, GitLab or GitHub?
We work on feature ...
- 13.4k