Questions tagged [git]

Git is an open-source DVCS (Distributed Version Control System)

Filter by
Sorted by
Tagged with
2
votes
1answer
80 views

How to cope with production rollbacks when using gitflow

We're reviewing the popular Gitflow as our git branching model and I've liked it so far. One case I'm not sure about is the production rollback. Say we've there's a new feature that we're planning to ...
4
votes
4answers
196 views

How to ensure that developers see only the project modules they are working on?

This is my first time PM experience. I have created a developer team and we want to work on an Angular-NodeJS project. I have defined some tasks and divided the project into the different modules/...
1
vote
1answer
59 views

Should we keep very similar files with slight feature differences under different names?

In my team, we use git branching to keep different features separate (of course). However, one co-worker insists on keeping these features in different files as well to avoid merge conflicts. For ...
4
votes
3answers
267 views

Git workflow for somewhat large team

The team I am on is using the git implementation in Azure DevOps. We have been using almost the GitFlow model. We are using story branches instead of feature branches, and the long-lived develop and ...
9
votes
1answer
737 views

What causes the “git rainbow”?

Sometimes when working with other developers with git version control I run into a problem where the git graph suddenly spawns countless parallels lines like in this image. Image from here. I have ...
1
vote
0answers
49 views

External standalone cpp code in my project

I've inherited a project that has a codebase in src/, but it also has precompiled binaries of dependency software in bin/. I would like to move away from having precompiled software as part of our ...
4
votes
1answer
66 views

Git replace file merging (or preserving) history

A long time ago - and long before I joined the project - my project was migrated from clearcase to git. This migration led to the following file layout: . ├── bar │ ├── bar.c │ └── bar.h ├── foo │...
-1
votes
1answer
67 views

Is rebase -i better then revert?

Say a branch is created with many merges/commits, then you figure out 1 merge was bad. Would it be better to undo it with rebase -i or with git revert or by manually undoing some changes and adding ...
5
votes
2answers
200 views

Where can I put project dependencies

I've just finished my studies in Computer Science and now I'm working. The problem is I'm the only computer scientist in my company and I'm probably taking a lot of bad habits. I would like to correct ...
-2
votes
0answers
47 views

Are Git Subtrees and Submodules intended to Solve Merge Conflict Issues?

Would using Git Subtrees and Git Submodules alleviate merging issues? Is that the intention for GitSubtrees and submodules? We have a large source control which handles 8 different functional modules....
2
votes
1answer
210 views

With the “git flow” approach, why are release branches merged into develop?

In the git flow workflow, it is recommended to create branches for releases, and when the release-specific work is done, merge the result into the master and development branch. I understand why we ...
-2
votes
2answers
68 views

Git Tagging for SaaS application with CD and SemVer

I'm developing a SaaS application where I'm required to keep track and publish every change in a changelog. I've started to follow a Semantic Versioning approach and also using Continuous Delivery. ...
0
votes
1answer
150 views

Why is Git LFS not the solution to the problem? [closed]

I am working with Perforce for 10 years. Our repository has around 500.000 submits and our submits are either C/C++ source code or (binary) dependencies. The lack of editor support for Perforce was ...
-2
votes
3answers
108 views

What is the best GIT workflow with CI/CD with submodules in a master to a test environment and a stable branch to a production environment?

We have a several GIT repos in Azure DevOps with .NET Core web applications that are related to each other with the use of submodule (we used autocreation of NuGet Packages in a private NuGet store, ...
1
vote
2answers
63 views

How do I maintain configuration in the case of multiple test environments and application instances

What's the best practice for maintaining app configuration for multiple test environments, (and production)? At the moment I am keeping all the config in the code repo (a bitbucket server). Configs ...
57
votes
8answers
9k 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 ...
-5
votes
2answers
105 views

How to make my team of developers follow our Git workflow [closed]

We have a team of 6 developers working in multiple technology stack. Most of these developers have little experience 1 - 2 years to be precise. We are very successful on enforcing coding standards ...
3
votes
1answer
114 views

How to leave debugging information in code before it hits production or even after?

Usually, I open a git branch to work on some task. When I finish the task I send it to be reviewed. Then it's sent to central staging git branch which contains all tasks that have passed review. Our ...
1
vote
2answers
174 views

GIT: Why use master (or any branch) as to reflect what's in production

We're having a debate here on our server development team, and I'm struggling. I've always used master as source of record for production, with the master branch (or some designated release branch) ...
-3
votes
1answer
136 views

In GitFlow, why not merge from master to feature?

It seems to me that the sooner a developer merges with released code, the better. In the original GitFlow article this isn't done. The original picture is this: When long lived feature branch on ...
2
votes
1answer
124 views

Keeping Feature Branches Clean with Pull Requests to Develop Branch

I'm using GitLab (which calls them merge requests rather than pull requests). From a couple of the comments below it seems like GitLab behaviour may be different from GitHub's. I'm trying to get my ...
2
votes
1answer
115 views

How can I make sure that only thoroughly tested changes make it into the master branch in git, without cherry picking commits from development?

We have two main branches here, master and development, and feature/bugfix branches come off of development. The issue we're having here is that we can't just merge development into master when doing ...
0
votes
2answers
77 views

Private and Public version of repository with minor difference

I am developing an application that has some features which are only meant to be available to members of the company while the majority of the application is for public use. Having two separate ...
1
vote
2answers
92 views

What directories and files should I push to my Git repository from local?

I have been using Netbeans to practice JDBC coding. Netbeans projects create multiple sub-directories (/build, /lib, /src...). Should I add and commit all of these directories and files or should I ...
2
votes
3answers
390 views

Isn't keeping the master branch intact essential for collaborating?

I've read a lot of useful articles about collaboration with git. Many do's and don'ts, etc. For example, Top ten pull request review mistakes and a nice article about git workflow The Perfect Code ...
0
votes
1answer
229 views

Why Git won't easily enable programs to output their version (commit hash)

If I understand correctly there is no built-in functionality in Git to simply let the program output which version or which commit hash string it is when it is run. Why not? Would it not be a simple ...
-3
votes
1answer
55 views

Git base code to be shared to multiple branches

I have a code that is reused for multiple projects. I'm having hard time to maintain across all branches. What's the strategy to maintain all of my branches? Say if I have a base code in one branch, ...
1
vote
1answer
241 views

What are the possibilities to embed GIT into application in order to manage version control of the projects that were created by that application?

I am developing an C++ application, which creates tree like structures (collections) of strings. I want to add the ability to save the information of these tree structures remotely/locally (can be ...
1
vote
1answer
154 views

Git strategy for separate teams in one project without access to eachother source

We have one project and separate teams which work on separate modules. What we need is a strategy that allows our teams to work on one project but without access to each other source codes. one ...
0
votes
2answers
103 views

Microservices: how far should coupling / decoupling of application parts relying on the same data backends go?

I am in the process of migrating a pretty much monolithic PHP application to microservices. With the development pipeline, docker containerisation, CI/CD and scalability in mind, what would be the ...
1
vote
0answers
37 views

How to setup git repository subfolder mirror?

It is known that Laravel Framework consist of library collection named Illuminate. In which some libraries are mirrored into separate repositories, right under https://github.com/illuminate/ namespace....
1
vote
2answers
440 views

Which artifact should I deploy to prod when using Git Flow?

Suppose I have the following series of commits when using Git Flow We have said that no new features will be included in the next release and have created a release branch (D). QA has started testing ...
2
votes
3answers
177 views

Git workflow for demoing features before release

My team and I are looking for a git workflow for demoing experimental changes/features in our web application before they are released. Our audience includes our project manager and designer -- people ...
-4
votes
1answer
127 views

Ways of managing multiple versions of software

I'm writing an IDE that will support many languages. I'd like to have a separate "version" of the IDE for each language, to avoid having a confusing number of seemingly unrelated features. I'd also ...
2
votes
1answer
116 views

Git model: branches for features based on master

I organize my Git projects based on the article A successful Git branching model. The problem is that I don't know how to handle the following case: develop: working on a major app redesign (taking ~...
-2
votes
1answer
49 views

How to maintaine a local git fork from a repo with many branches

I'm using a public git repository and adjusting it to my specific needs, meaning that the changes are not worthy of being merged upstream. Repo is in github (upstream), and we maintain our own git ...
3
votes
3answers
100 views

How do I review a Git merge that had some manual conflict resolution?

I have two feature branches that were recently merged, and I'm trying to examine the diffs as an informal code review after-the-fact. feature1 with about 50 commits was merged into master and a merge ...
1
vote
1answer
137 views

Splitting up a big project for several teams by git

We have a big angular project that works with several APIs provided by other projects. This project has a common part that is shared by all. It includes smaller sections dedicated to different teams ...
1
vote
2answers
272 views

Should feature branches always branch from develop?

I'm a Rails developer and I've always had this doubt, let's say I have to develop things for the user's controller and views (branch feature/users-endpoint) and imagine I end up developing several ...
2
votes
2answers
64 views

simple question about Git workflow for subproject

My research team and I are using Git to manage our various scripts and notes/publications for our on-going projects, and I'm wondering about what is considered best practice for the situation we are ...
0
votes
1answer
264 views

Managing multiple interdependent git repositories

I am currently working on a project comprising multiple sub-projects. Each sub-project, in turn, consists of multiple components, which might be shared by two or more sub-projects. Let's say, for ...
1
vote
1answer
179 views

Request changes to a commit message during code review on GitHub

I am trying to teach good engineering practices to my team, and in particular, walking them through the basics of PRs and code reviews on GitHub. One of my team members has sent me a request to review ...
0
votes
2answers
146 views

Need feedback on proposed git flow

We just migrated to git from svn and are trying to define a process that would help us achieve the following: Deployment to dev env without requiring code review. Have a pull request / code review ...
1
vote
1answer
186 views

How can I get rid of a dependency in a single branch?

I am working on an API solution, split in three projects: API Domain DataAccessLayer I have created an interface, in the Domain project, ICustomerRepository, with a single method: Domain.Customer ...
2
votes
0answers
123 views

Gerrit: Working around the “single-change:single-commit” principle. Need Feedback

I have been using Gerrit in my work environment and I find it really amazing and powerful because of its elegant use of git's branching features to create virtual branches for code reviews (the "refs/...
2
votes
4answers
337 views

Can long lived feature branches be justified by merging master into the feature branch daily

I've always considered long lived feature branches a symptom of some underlying problem, but I've recently moved jobs and the company I am working for now encourages long lived feature branches. They ...
0
votes
1answer
115 views

Branching strategy with GitHub releases

I am working on the project where currently we have following three fixed branches Develop - The code is deployed to development environment. It's a base branch for anyone who want to add new ...
1
vote
1answer
144 views

Where to commit small, miscellaneous changes

Let's assume that I am working on a small project that uses feature branches to organize tasks. For example, feature/login would be for working on the login functionality and feature/create-new-post ...
0
votes
0answers
57 views

Separating Development and Deliverables with Git/Github

I am looking for some advice on the best way to manage my development worflow. I have been using git locally to track development and have recently uploaded a couple of private projects into Github. ...
-2
votes
2answers
287 views

Git Branching Convention : Baseline from Dev or Master

When creating a new feature branch should i baseline from Master branch or Dev branch and why? I am used to creating a branch from master as the baseline, making my changes and merging it back into ...

1 2 3 4 5 20