python (12.9k questions)

javascript (9.2k questions)

reactjs (4.7k questions)

java (4.2k questions)

java (4.2k questions)

c# (3.5k questions)

c# (3.5k questions)

html (3.3k questions)

Questions - git-flow

How to use Git to maintain several versions of my code?

I am maintaining an application and I want to have multiple versions of it, say an international version and a Chinese version. Of course, the configuration files for different versions are different,...
test-img

beedrill

git

git-branch

git-flow

Votes: 0

Answers: 1

Latest Answer

My advice is do not use Git for that. If you have multiple branches, you really have several separate and independent copies of your program. Even though Git gives you some powerful tools for maintain...
test-img

jurez

Git - Merging develop into master causes major conflicts when it shouldn't?

I am a little confused as to whats happened to my branches. The process I have been following for a release are: Create release branch off of develop when ready for release. Test release branch Any bu...
test-img

Barry

git

merge

git-flow

Votes: 0

Answers: 1

Latest Answer

First off, I'm assuming you're using the documented Git Flow, or a close variant. If that's true, then: I agree with you that you should never have conflicts when merging release into master. So now l...
test-img

TTT

How to handle hotfix in GitFlow and GitLab MR's?

We use GitLab and its MRs. We use a gitflow (just without release branches). Master is our production branch and develop the current dev branch. Master and develop are protected on GitLab so any push ...
test-img

MuyBien

git

gitlab

git-flow

merge-request

Votes: 0

Answers: 0

How to update the value of version key in package.json

I use git flow to manage my work flow on git. I use yarn but I can't seem to find any answer on how to update the version in my package.json I guess there must be some way to bump up the version when ...
test-img

Rizwan Liaqat

git

git-flow

Votes: 0

Answers: 1

Latest Answer

Dafna Rosenblum recommends: npm-version After creating the release branch, you should running ./bump-version.sh. This is a fictional script that updates the version number of the project. As I mentio...
test-img

VonC

Posts

Questions

Blogs

Jobs