All Questions
Tagged with git development-process
23 questions
2
votes
2
answers
821
views
What are the pros and cons of using cherry-pick versus merge for release management? [closed]
What are the pros and cons of using cherry-pick versus merge for release management?
Background
We have a dev branch, and just created a release1 branch from it. Folks will commit relevant content to ...
- 565
3
votes
3
answers
418
views
Static types and dependencies in trunk-based development
There're certain things in code that can't be conditional. Two very common examples:
static types
dependencies.
You can't naturally enable/disable a feature that implies a new dependency or a new ...
- 149
5
votes
2
answers
475
views
Proactive git branch conflict detection?
I'm considering creating a new tool, but I wanted to find out if something like it already exists.
tl;dr: Looking to make or employ a service which scans a SCM repository with the explicit goal of ...
- 529
59
votes
8
answers
12k
views
Do seasoned developers still have to deal with merge conflicts?
I am still a software engineer in training, but I have heard the following adage multiple times:
Good coders don't have to deal with merge conflicts.
Whenever I work on a project with others, I'm ...
- 733
0
votes
1
answer
277
views
Git branching model for teams with develop, test and deploy phases
A developed piece of code goes these phases in our team:
Developers write the code
Then they send it to testers
If tests pass, then testers send the change/new feature/bugfix to operations team for ...
12
votes
3
answers
585
views
How do I start using Git for differing code bases from different servers?
Background: I've recently inherited a set of projects at my company and I'm trying to sort out some fundamental issues with how they've been handled. Namely, the previous developers (who are no longer ...
- 131
3
votes
4
answers
1k
views
Different feature set in multiple mobile apps from the same code base
I inherited a large code base (iOS / Objective-C) that is used to build multiple mobile apps. The apps have similar, but not identical UI.
The apps share a lot of common features, but there are ...
- 199
120
votes
7
answers
21k
views
My office wants infinite branch merges as policy; what other options do we have?
My office is trying to figure out how we handle branch splits and merges, and we've run into a big problem.
Our issue is with long-term sidebranches -- the kind where you've got a few people working ...
- 1,330
6
votes
3
answers
4k
views
Do we need a separated branch for fixing bugs raised during the testing phase?
Before release a new version of the software, which is a web application, my company creates a release branch. The QA team tests that branch and reports some issues. Should developers commit the ...
- 673
-1
votes
1
answer
62
views
New project development & git guidlines and hints [closed]
We are two senior students and we want to develop an app.
Although we dont have experience on using git & github.
Our app will consist of a server handling requests with a mongoDB database. The ...
- 109
-1
votes
1
answer
449
views
Ideas to improve our development and deployment process?
In the interest of continuous improvement I'm interested in finding ways to improve our software development process. There are a lot of articles out there which define a set of workflows, but all of ...
- 187
2
votes
2
answers
806
views
Using Pull Requests with different commits
For a new project we try to set up the development process and the intention is to have a simple, pragmatic process. We use Atlassian Stash with Git in our company.
We came up with the following ...
- 1,774
26
votes
5
answers
13k
views
Why use pull requests instead of merging
What is the advantage of using pull requests instead of simply merging a branch into master without one? Particularly on a team where all developers have full access to master.
- 1,918
3
votes
2
answers
3k
views
How to split development / staging / production versions of an application
I'm facing a situation that does not seem to have a clear solution to it, which leads me to believe I'm actually doing something wrong. Here I am seeking advice once again.
To rapidly let you ...
- 2,193
6
votes
3
answers
418
views
Do we need to create local branches for the enhancements we are working on?
We just started implementing the Git source control for our project and the Admin says we should not be creating any new branches for the enhancements that we are working on instead everybody should ...
- 221