Questions tagged [git]

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

Filter by
Sorted by
Tagged with
-3
votes
2answers
62 views

Gitflow, use code from another feature branch in feature branch

me and a friend are working on a project, and we are both doing seperate things (he does UI, I do some data structure), and his code relies on my code. Right now we have a master, a develop and 2 ...
2
votes
1answer
101 views

Is there a convenient way to include only a particular snapshot of a git repository inside another project?

Update: I think I may have found one possible solution for this question: git worktree. I'll have to investigate its exact workings a bit more, because I'm not entirely sure yet if it can do what I ...
2
votes
2answers
101 views

Releasing from feature branches

My app is being deployed on various platforms, among which GNU/Linux, iOS and Android. I am contemplating the branching model of the central C++ code git repo, upon which all platform-dependent code ...
0
votes
0answers
29 views

How do I map commits from a DVCS to the actual version numbers? [duplicate]

When using a centralized version control system such as SVN, where every commit acquires an auto-incremented number, it is relatively easy to track what version is released to production by simply ...
-3
votes
0answers
32 views

How does release packaging and versioning done both in the artifact and the Git side by implementing git flow?

I'm working on a solution about modernizing the packaging, versioning and release management of a legacy system. Current system contains lots of NAnt build scripts in the source code which are long ...
-3
votes
0answers
27 views

Azure DevOps How to share a Class Library between Project Collections?

I created a project collection in Azure Devops a long time ago: Super Project! Super Project has a front end, a few libraries, test projects etc. I then created a new project collection for a ...
0
votes
5answers
156 views

How to reduce the merge-redundancy due to testing in our Git workflow?

We have are a small team of 6 people working with Scrum and Git. We are developing a quite complex webapplication with the ZK Framework. It uses Java and a MySQL database. We have adapted the "Git ...
-3
votes
1answer
29 views

how to manage build and deployments from Multi repos using versions

Consider you have two repos A, B. Let say repo A has some infrastructure code - not needed to be updated always- but it has the code for the service we want to deploy as infra. On the other hand, ...
0
votes
2answers
74 views

What's the correct Git flow to develop on two independent features + one feature that relies on both?

I'm trying to find the correct flow to manage this kind of development, where A and B are two independent features, and C is a third feature that relies on A and B. An obvious approach would be to ...
0
votes
2answers
66 views

Could git be implemented in SAP ERP instead of the transport system?

In SAP ERP (probably in other SAP systems as well), you have transport orders which you could see as "commits" i guess in git. These transports are send from development to test or production system ...
6
votes
2answers
207 views

Versioning in parallel features development

I have a library (npm package, LIB) which is used by the application code (APP). In a release of APP, multiple features are worked on parallely. Sometimes these features need support from LIB, so the ...
0
votes
0answers
24 views

Gradle + Git - enforcing a version change upon merge to master

I am leading a team of developers creating a Java library. We are following the standard Semantic Versioning model. The code is versioned with Git. Artifacts are built and pushed to an artifact ...
25
votes
6answers
5k views

How to structure commits when unit test requires refactoring

I'm trying to get a review for my lists of pros/cons about how to structure commits that came out of a discussion at my work. Here's the scenario: I have to add feature X to a legacy code base The ...
3
votes
3answers
134 views

TDD and GIT workflow. How big should branches be?

Let's say we are using TDD while developing some Calculator class (the simplest case - it should provide add, sub, mul and div public methods). We initially start with develop branch. The following ...
2
votes
2answers
72 views

Git work flow with pull requests

I have come across a small issue with the git work flow in the team. When starting to work on a user story, we create a feature branch from the develop branch. Once the user story is finished, a ...
-1
votes
1answer
95 views

Good / Bad idea to start a pull request in the beginning of a project

The current workflow we have in place at my company with regards to git is: Develop on a branch Push every so often When done developing, open a pull request in Github We have a reviewers on that ...
-1
votes
2answers
79 views

How to Maintain Rarely Used Scripts

I come across the need to do a lot of one time scripts (related to API evaluations, data extraction, experiments etc.) that have the potential only to be used very rarely in the future. These could be ...
2
votes
2answers
112 views

Rewind commits to new branch in git

I have three branch on my git tree. master contains validated source version, develop contains staging versions, then I have some feature branches. For now, I have the current strucutre; The numbers ...
3
votes
2answers
128 views

Git commit hashes and Git merging between branches

We have a scenario where we'd like to use two branches in our git workflow, otherwise known as develop and master. The current flow is as follows: Create feat-branch - this branch will be based off ...
-3
votes
2answers
105 views

Using Github Branches to maintain two versions of a project?

I have a Github project for a Django web-app that one team uses. Other teams are interested in also using it and they'll need separate instances of it (it's a stock tracking database so they need to ...
2
votes
1answer
111 views

In what file do I put the installation steps in my git repository?

I have a git repository and I would like to add the installation steps required to make the project work locally. The project is a company and private project and users will also be contributors. I'm ...
0
votes
3answers
216 views

Does it actually matter from which branch you create a new branch in git?

Well as per title, does it matter in any way functionally (say when rewriting history or something), from which branch one derives a new branch? If at the point of time when creating the new branch ...
38
votes
6answers
8k views

Whose responsibility is it to fix merge conflicts?

Say that A is working on a branch based off master and B merges changes into the master branch, which introduces merge conflicts between A's branch and master. Whose responsibility is it to fix merge ...
2
votes
1answer
93 views

Are symbolic links a good way to 'import' a project into another?

I've been thinking on how to import a project B into a project A, which both are GitHub repositories. Project B is a library I reuse over many projects, I do add stuff in it, directly from project X, ...
2
votes
1answer
181 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 ...
3
votes
4answers
347 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
67 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
292 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 ...
10
votes
1answer
824 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
52 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
77 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
75 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
210 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
1answer
260 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
121 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
170 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
132 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
67 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
112 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
125 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
235 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) ...
-1
votes
1answer
223 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
183 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
117 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
3answers
95 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
160 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 ...
3
votes
3answers
411 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
235 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
58 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
2 3 4 5
21