Questions tagged [git]

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

45 questions with no upvoted or accepted answers
Filter by
Sorted by
Tagged with
7
votes
1answer
1k views

Combining GitHub and TFS / Visual Studio Team Services

I wonder if it's possible to combine Visual Studio Team Services and/or TFS with a GitHub repository. We think both products have their own advantages and would like to work on one repo within our ...
4
votes
1answer
752 views

Branching a subdirectory while keeping commits from other directories

I currently have a single pre-existing Git repo for a client/server solution that contains three subdirectories for 3 sub-projects: /client - An Angular2 SPA application (client-side TypeScript) /...
3
votes
0answers
194 views

Proper GIT repository usage that accommodates feature branches and parallel testing

After reading around I found that there were various git workflows being used but there aren't enough (or I just haven't found them yet) info on how to use git properly with having test builds. I was ...
3
votes
0answers
639 views

git tagging comments - best practices

I've adopted a tagging system of x.x.x.x, and this works fine. However, you also need to leave a comment with your git tag. I've been using descriptions such as "fixes bug Y" or "feature X", but is ...
2
votes
0answers
322 views

Handling multiple pull requests from a branch

Our current workflow is that we create a Sprint branch and then developers create Feature branches having the user story number. Once the story is complete this Feature branch is merged to Sprint ...
2
votes
0answers
57 views

Can/Should I make an automatic installation of new python libraries after a git pull?

Imagine the following situation: I'm working on a python project, and I install the library antigravity with pip. I add the function fly() which uses the library, and I commit and push the changes. ...
2
votes
0answers
642 views

Project structure with git submodules with common dependencies

I have two (and more in the future) Python projects that I'd like to package into a global package in order to import its modules and use them in another external projects in the future. This is how ...
2
votes
0answers
91 views

How to remove and archive source code in a git project so it can be found

I'm working on a project where requirements are rapidly changing, therefore some functionality is built then rapidly replaced by other functionality. I'd like to remove some functionality from the ...
2
votes
0answers
111 views

Implementing redundant GIT backup scheme

I want to push a local repo to multiple remote GIT repositories to achieve redundancy in my backup scheme. So, let's say I plan to use Github and BitBucket to host my repositories. I have two ...
2
votes
0answers
1k views

Does TFS have the capacity equivalent of branching/forking in Git?

We've got talking about branching and forking in Git and a teammate asked if there's something like that in TFVC (hereafter referred to as TFS). I explained that there is, although it's managed ...
2
votes
1answer
324 views

Multiple git committers on same repo and machine with forwarding agent

I have a remote machine where multiple developers work on the same repository. We use gitolite and SSH keys to manage git access. As for now we code on the local machines, commit, push, pull remotely ...
1
vote
1answer
106 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
0answers
67 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/...
1
vote
1answer
72 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 <- ...
1
vote
2answers
172 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 ...
1
vote
0answers
25 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 ...
1
vote
0answers
37 views

Wordpress and git, (using WPE), how do you incorporate database changes into the workflow?

We use WordPressEngine and want to have multiple developers and multiple branches using git. One challenge is how do we incorporate the database into the workflow? Should we take a sql dump and ...
1
vote
0answers
38 views

What impact does the ancestor file have with git merge-file?

Consider this example command line session... $ git --version git version 2.19.0.windows.1 $ echo "header" > ancestor.txt $ cp ancestor.txt left.txt $ cp ancestor.txt right.txt At this point, ...
1
vote
0answers
305 views

Multi module Maven project or separate repositories?

Consider the following architecture: Application A Application B Commons-Util A and B share a lot of functionality. That's why we plan to extract the shared code into a commons library. I am aware ...
1
vote
1answer
70 views

how to maintain settings across different repositories

So I have .eslint and .settings (VSCode) files that I would like to be consistent across projects. How would I do this? Currently, I am thinking that I should put them into a repository, which then I ...
1
vote
0answers
57 views

Are squash-merges compatible with the Developer Certificate of Origin?

The Developer Certificate of Origin appears to be widely used in open source at this point, including support at GitHub and use by GitLab community edition. In accepting a pull request, many folks (...
1
vote
0answers
283 views

How to manage multiple NuGet packages in GitHub and Artifactory?

My colleagues and I are in the process of re-architecting our system. The old system is a ASP.NET monolith using TFS for source control. The new system is made up of ASP.NET Core microservices using ...
1
vote
0answers
894 views

VS2015 & Git Submodules

We have a few projects in my organization that are being developed in parallel and I have found that they are increasingly using similar Utility/Logging/Etc functionalities that they have as separate ...
1
vote
0answers
80 views

Working on the same file for two tickets

The company policy where I work is that code cannot be committed to SVN until a code review is complete. This is sensible enough as we don't want broken code ending up in the repo, but it does give us ...
1
vote
0answers
116 views

Git Repositories updated

I would like to keep two Git repositories updated. First one, is GitHub open source project that gets updated frequently. Second one is a private held Git Repo located other than GitHub. This one ...
1
vote
0answers
146 views

Version Control for several projects

I've found several things about how to manage a data science projet with GIT but I didn't find something about how to manage a set of projects. In 90% of the case I'm working alone and over the ...
1
vote
0answers
38 views

version control (mercurial) access by subproject

I have a central codebase, from which I branch subprojects for each client. Right now I have the central codebase in mercurial repo A and client specific code in mercurial repo B, C, D... etc. I would ...
1
vote
0answers
286 views

Git collaboration with pull request in a company

I am thinking of a way to do collaboration between coders in a company, suppose we have 2 type of servers: Production and Staging. Now we want to review all changes going to Production via pull-...
1
vote
0answers
195 views

GitShell, how can I not type the username and passwords?

Open the CMD, and I should type the password and usename? In the GitShell opened by shortcut, I don't need to type the username and password. Related is here: https://softwareengineering....
0
votes
1answer
206 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 ...
0
votes
1answer
111 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 ...
0
votes
1answer
137 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 ...
0
votes
0answers
54 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. ...
0
votes
0answers
90 views

Git feature branch workflow for multiple branched features

I wanted to summarize a quick discussion we had in my stand-up today. We have a big feature branch merge coming up in our system. We are replacing the old live, system (branch master) with a redesign (...
0
votes
0answers
1k views

What are best practices to synchronize multiple git branches?

For example, Gitlab indicates that the develop branch is behind master: Example 1 Example 2 One could make a merge request from master to develop, but as there are no code changes it seems ...
0
votes
0answers
106 views

Is updating a remote-tracking branch by local branch a good practice?

In Pro Git you can see: Remote-tracking branches are references to the state of remote branches. They’re local references that you can’t move; they’re moved automatically for you whenever you ...
0
votes
0answers
156 views

Version Control & Deployment on Large Ecommerce Site

I am currently Front End Dev for a large ecommerce store and I'm wanting to switch the entire site to a Version Control System (Git) and Deployment service (Beanstalk). I'm having trouble ...
-1
votes
1answer
200 views

Implement Branching strategy in DevOps for Multi-Tenant application

I have asked this question on Stack Overflow and I got a suggestion of posting it here for better suitability. So here is my question : I am new to DevOps, and i have a solution with Umbraco as CMS, ...
-1
votes
1answer
57 views

Should I further branch off of a new branch or continue developing an additional feature in the same branch?

I have a branch (dashboard) which I am developing a new feature on. To make the example easy to follow, I am developing two separate functions (function1() and function2()). They work how I want ...
-1
votes
1answer
107 views

Looking for a good git workflow for new projects with a small team

I work in a small team of developers (there are 3 of us). in the research that I have done, the workflow that most teams seem to follow seems to be as follows a branch is created for a feature and ...
-1
votes
1answer
101 views

How, in eclipse do I work with an existing maven project in GitHub without ending up checking my .project file?

I have a maven project in GitHub that I wish to work with using eclipse. I want to keep the GitHub repository clear of any eclipse project artifacts such as the .project file. Is there a way to do ...
-1
votes
1answer
110 views

What happens when create new brand in Git?

I'm new to Git and SourceTree tool. I don't understand why this happens? My steps: 1. Create new brand, named develop/john/LinksMiddleware/new 2. Stages changed files, for more details there're ...
-1
votes
1answer
63 views

Knowing what will get released in gitflow

We are a web SaaS company using gitflow and JIRA. As we are 'done' (QA approved) with a feature, we move the story/ticket forward in Jira to a 'done' status. At that point we wait until it gets ...
-2
votes
0answers
25 views

Designing a Source Control for a SaaS with B2B & B2C softwares

Introduction: I'm working on a SaaS product that is up & running in the production. However, we are now going to sell this product for enterprises to work locally on their servers. I'm currently ...
-3
votes
1answer
169 views

Version control problem

I heavily use Excel and CSV at my workplace. File 0 Excel File The initial file is an Excel file. Let's call this File 0. This may or may not change with time depending upon the requirement of the ...