Questions tagged [git]

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

Filter by
Sorted by
Tagged with
0 votes
1 answer
971 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 ...
user avatar
2 votes
1 answer
768 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 ...
user avatar
2 votes
1 answer
138 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 ...
user avatar
  • 491
0 votes
3 answers
108 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 ...
user avatar
1 vote
2 answers
2k 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 ...
user avatar
3 votes
3 answers
537 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 ...
user avatar
1 vote
1 answer
302 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 ...
user avatar
-3 votes
1 answer
158 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, ...
user avatar
1 vote
1 answer
598 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 ...
user avatar
  • 57
1 vote
1 answer
409 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 ...
user avatar
  • 119
0 votes
2 answers
131 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 ...
user avatar
  • 133
1 vote
0 answers
92 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....
user avatar
  • 127
1 vote
2 answers
2k 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 ...
user avatar
  • 269
2 votes
3 answers
301 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 ...
user avatar
  • 21
-4 votes
1 answer
262 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 ...
user avatar
  • 103
4 votes
1 answer
141 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 ~...
user avatar
-1 votes
1 answer
60 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 ...
user avatar
  • 123
3 votes
3 answers
214 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 ...
user avatar
1 vote
1 answer
296 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 ...
user avatar
1 vote
2 answers
403 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 ...
user avatar
  • 729
2 votes
2 answers
75 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 ...
user avatar
  • 123
2 votes
1 answer
2k 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 ...
user avatar
2 votes
1 answer
1k 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 ...
user avatar
0 votes
2 answers
268 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 ...
user avatar
  • 21
1 vote
1 answer
193 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 ...
user avatar
3 votes
0 answers
440 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/...
user avatar
3 votes
4 answers
2k 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 ...
user avatar
1 vote
1 answer
478 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 ...
user avatar
2 votes
1 answer
334 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 ...
user avatar
0 votes
0 answers
150 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. ...
user avatar
  • 109
-2 votes
2 answers
1k 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 ...
user avatar
  • 107
0 votes
1 answer
203 views

Any advice for Git workflow using branch per development team (and not per feature)

In our project, we have 5 teams working on a monolithic application in 3-week sprints. Until now, all commits go into master (via Gerrit). Our test pipeline is too lengthy to ensure quality pre-commit,...
user avatar
  • 317
2 votes
1 answer
918 views

How can I sync a git repository with directories from another machine?

My team and I use a git repository to keep track of our projects. This repository is cloned in our Windows PCs that we use to develop most of our software. However, we also use another machine ( a ...
user avatar
4 votes
3 answers
289 views

What's the best approach when you need to work off two branches that still have pending PR requests?

Let's say I have branch-1 (branched off master (major update)) and branch-2 (also branched off master (minor update)). What is the best approach to do when I need to create another branch, e.g. ...
user avatar
57 votes
8 answers
11k views

Should generated documentation be stored in a Git repository?

When you use tools like jsdocs, it generates static HTML files and its styles in your codebase based on the comments in your code. Should these files be checked into the Git repository or should they ...
user avatar
-3 votes
1 answer
148 views

Designing a mentoring system over GitHub

I am developing a system that has a list of projects (verified by mentors) to which a student can provide a solution. Now I am stuck in a situation about how the student will submit their solution for ...
user avatar
-2 votes
2 answers
540 views

Pushing commit (even in a dirty state) daily to remote git repository without polluting it with many work in progress commits

Context We have a team of one active developer and two occasional ones. We are setting up a new project and after reading https://nvie.com/posts/a-successful-git-branching-model I was seduced by the ...
user avatar
  • 67
0 votes
2 answers
204 views

Need a Git branching how-to

Using GitFlow, I created a new class on the develop branch and gave it a property: Public Class Class1 Public Property Property1 As String End Class I committed that change and created a new ...
user avatar
  • 223
2 votes
1 answer
720 views

NuGet versioning with gitflow

Some background information to our actual situation. We are migrating from TFS VC to git. We've a ASP .NET Web API with many different Controller Libraries (>30 assemblies). Many of them are ...
user avatar
0 votes
1 answer
127 views

Git strategy to use when a file I am going to edit in another branch has been updated in the master branch?

There are 3 branches involved in this question. I have the master branch, I have a bug-fix branch, and I have a refactor branch. This is the timeline: Created bug-fix branch off master to fix a bug. ...
user avatar
-1 votes
1 answer
1k views

Unit tests branch best practices [closed]

I'd like advice about on the best practice for Pull Requests organizing on middle size project. Especially relating to Unit Testing. Currently we create branch for each feature, what is practically ...
user avatar
3 votes
1 answer
205 views

Git structure for multi platform projects

Currently I use SVN for my project and the structure looks like this: trunk/SharedLibrary/ trunk/platform/wordpress/ <- platform base directory trunk/platform/wordpress/SharedLibrary <- ...
user avatar
1 vote
1 answer
301 views

Is infrequent syncing in DVCS trunk based development similar to a long-lived feature branch in GitFlow?

I'm working on a project and trying to understand the differences and trade-offs between variations of trunk based development and feature branching like git flow so I can help implement an ...
user avatar
  • 185
3 votes
3 answers
980 views

How to approach long-lived feature code reviews in trunk based development?

My understanding is that trunk based development should rely on direct commits to master or short-lived feature branches that are merged with master. Incomplete work can be placed inside functions ...
user avatar
  • 185
2 votes
0 answers
42 views

AWS codepipeline deployment

I currently have an AWS Codepipeline that is setup to automatically pull an Express, NodeJS API and deploy it with Lambda and API Gateway. It pulls the code from my GitHub repo production branch and ...
user avatar
0 votes
1 answer
66 views

Removing unused directives from a file which is not related to the pull request [duplicate]

I'm actually working on the web application which was made using technologies such as asp.net core, c#, angular, ef core. For the version control and CD we use Azure DevOps. As a team we try to follow ...
user avatar
  • 101
1 vote
1 answer
140 views

How to organize work with a few projects with shared codebase?

We develop two projects (and more in future) with JS, Vue.js, using npm, and we store each project in its own git-repository. We want to place common components (buttons, page-parts and page ...
user avatar
0 votes
1 answer
209 views

How to have SQL Server with Git, TeamCity and Octopus auto-deployment work with schema-level restrictions?

We are starting to integrate our SQL Server workflow with Git, by which I mean generating scripts for all objects and storing them in a Git repository so you can pull, edit, commit, push and apply, ...
user avatar
2 votes
4 answers
2k views

Git Flow, pull requests, multi-destination branches and conflicts: how is it supposed to work?

I get it for feature branches: A feature branch is created from develop. One single PR is then created, going to develop. If there are conflicts, fix them in the feature branch. Quite ...
user avatar
  • 620
-2 votes
1 answer
742 views

Managing release branches in Git

When learning Git for the first time, I posted Git branching and tagging best practices. I learned a lot from this and have adapted git flow patterns to my personal projects since then. I am now in ...
user avatar
  • 2,379

1 2 3
4
5
23