git-workflow

git workflow for a project with open-source and proprietary (private) part [closed]

由 ◇◆丶佛笑我妖孽 提交于 2021-02-08 10:18:34
问题 Closed . This question needs to be more focused. It is not currently accepting answers. Want to improve this question? Update the question so it focuses on one problem only by editing this post. Closed 2 years ago . Improve this question Wordpress plugin with free and PRO version. The PRO version contains additional files, scattered across the codebase. What is the optimal strategy to track both versions in git, satisfying the following constraints: free version is open-source on GitHub,

Git subtree workflow

由 谁都会走 提交于 2020-01-01 15:57:45
问题 In my current project I'm using an open source forum ( https://github.com/vanillaforums/Garden ). I was planning on doing something like this : git remote add vanilla_remote https://github.com/vanillaforums/Garden.git git checkout -b vanilla vanilla_remote/master git checkout master git read-tree --prefix=vanilla -u vanilla This way I can make change into the vanilla folder (like changing config) and commit it to my master branch and I can also switch into my vanilla branch to fetch updates.

setting up git repository on local machine

由 时间秒杀一切 提交于 2019-12-20 09:48:26
问题 How can I setup a git repository on a local system ? (I am on a windoze box) This is the setup I am trying to achieve: (everything is on my local machine) host folder (which acts like central repository) client folder I want to do all my dev in the client folder. Once I am done, I'd like to push it to the host folder. This is what I've done: (using git bash on windows) cd d:/adinsert mkdir host cd host git init cd c:/ mkdir client cd client git init git remote add origin d:/host // Added some

How do you keep changes separate and isolated across multiple deployment environments in git?

由 落爺英雄遲暮 提交于 2019-12-19 04:25:55
问题 At my workplace, we are attempting to design a workflow based around Git to handle our deployments and changes to the code. We have a Java EE web application and 3 deployment environments (Test, QA and Production). We also have an instance of Jenkins CI to handle builds and deployments. When changes are made to the application's code (in branches) we need to be able to pick and choose which ones get promoted to QA and Production. Some might get to QA and then never go to production. We also

Strange git behaviour reverting changes made in local branches after pulling upstream merges

由 為{幸葍}努か 提交于 2019-12-11 03:25:42
问题 We have a team of around 10 developers and we are frequently running into a situation where someone's changes got reverted unexpectedly. Our workflow has been very simple. Developers make local commits, pull from upstream, and then push to upstream (this is our workflow in a nutshell, but it may also include issuing pull requests on Github from a developer's personal fork of upstream). The strange behavior is a developer makes local commits, pulls from upstream, and then finds his changes

Deploy git branches

由 做~自己de王妃 提交于 2019-12-09 23:37:19
问题 After struggling with and sorting out a workflow for web development with git, I've been tasked with adding in a staging server at the last second. We develop/test locally and push out to a repo, and now there needs to be a sandbox in between so people in other departments can play around and try out new things without breaking stuff. Remote repo needs two long-running branches (in the spirit of nvie's branching model), master and develop. We need to be able to push to one repo, and checkout

Git Workflow, Nvie Branching Model Ahead and Behind

由 北慕城南 提交于 2019-12-08 07:33:12
问题 Following Nvie's git branching model, why do I end up with 'develop' and 'master' each 1 ahead and 1 behind the other after merging the same 'release' branch into both? If the same 'release' branch is merged into each, shouldn't master and develop agree? x 84a628d (origin/develop, develop) Merge branch 'release-v3.0.1' into develop |\ | | x 2e4d60b (HEAD, v3.0.1, origin/master, master) Merge branch 'release-v3.0.1' | | |\ | | |/ | |/| | x | 716ce96 (release-v3.0.1) Version 3.0.1 |/ / x |

With Git feature branch workflow, when do you update the master branch?

由 拜拜、爱过 提交于 2019-12-07 13:20:15
问题 I'm fairly new to git and Jenkins. We want to use Jenkins and follow the feature-branch-workflow concept, which I believe is similar to the GitHub flow. I'm aware that the master branch should always be what's currently deployed in production, but then when should the master branch be updated? It seems like there are two choices: BEFORE deploying to production: A pull request gets approved and the successful merge with master triggers the build, deployment to a staging environment, QA testing

Git Workflow, Nvie Branching Model Ahead and Behind

由 本小妞迷上赌 提交于 2019-12-06 17:06:49
Following Nvie's git branching model, why do I end up with 'develop' and 'master' each 1 ahead and 1 behind the other after merging the same 'release' branch into both? If the same 'release' branch is merged into each, shouldn't master and develop agree? x 84a628d (origin/develop, develop) Merge branch 'release-v3.0.1' into develop |\ | | x 2e4d60b (HEAD, v3.0.1, origin/master, master) Merge branch 'release-v3.0.1' | | |\ | | |/ | |/| | x | 716ce96 (release-v3.0.1) Version 3.0.1 |/ / x | fe3b54d Some more more code x | 3683892 Some more code x | 8c0b835 'develop' branch code |/ x d051b54 (v3.0

How to keep branches in sync when using Git Flow

由 做~自己de王妃 提交于 2019-12-06 12:49:38
问题 This is the workflow we currently follow: Finish a feature and merge it into develop branch Create a release branch from develop Run build scripts on release branch Create a pull request to merge the release branch into master Accept the release branch pull request and merge The master branch can then deploy to live server by running deploy command This all works great, except in my Git repo my branches are out of sync master is now behind develop because it doesn't have the merge commits
订阅 git-workflow