Questions tagged [git]
Git is an open-source DVCS (Distributed Version Control System)
0
votes
0answers
21 views
SVN / Git How to administer branches
I'm the technical lead for a small company (6 developers). We currently use SVN and we're slowly porting over to Git, after everyone gets their training.
Currently our clients are the ones who "pull ...
2
votes
1answer
85 views
Do we have distinct type of branches?
There is what we call feature branch in git.
Imagine for example I am making a game and I need to add a Power-up feature.
How I see my commits names with feature branches:
Branch name: Adding Power-...
2
votes
2answers
87 views
Git workflow regarding remote feature branches
I've been using git for a while, but still do not understand how to deal with feature branches.
When you develop in a feature branch in a strictly local manner everything makes sense. You commit, ...
1
vote
1answer
44 views
managing multiple git repo that are similar
We are creating several websites, the main content will be the same across each of them but there will be some differences (e.g. extra button, extra texts, different styling)
what is the best way to ...
-4
votes
1answer
65 views
GIT - how to confirm repository ownership
I am starting a new service that would be an abstraction on top of git repositories. Basically, a user would sign up and Add Project (GitHub/GitLab/BitBucket repository).
The tricky part for me is ...
-1
votes
1answer
55 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 ...
3
votes
1answer
341 views
Does it matter which branch I push to?
My question is around how branch pushes work exactly; I have come across something that doesn't make logical sense to me and as such would like an explanation as to why I am experiencing this ...
0
votes
1answer
74 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 ...
-1
votes
1answer
52 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 ...
1
vote
1answer
40 views
Versioning hardware vendor SDK with git
We have n C projects which reference 4 different versions of a device SDK - 12.3, 13.1, 15.0, and 15.2. There is no public upstream repo for the SDK - it is released as a zip file. We need to patch ...
0
votes
1answer
102 views
How to handle complete rewrite of a file in regards to code review
My situation is this: I am contributing to a Symfony/PHP project. I had to completely reskin one page in the application. The controller logic is almost totally unchanged. I only had to change the ...
3
votes
1answer
77 views
Git “dynamic merge” of multiple branches
I work with a feature branch model where the branches get merged into master when they are ready. Before a larger test (specific to my field of work, involving a lot of heavy hardware), several ...
1
vote
1answer
37 views
Sould i tag a hotfix release in production using GIT scm
We have weekly planned release cycle. Following standard semantic versioning system. Like first week V3.0.0, next V3.0.1 patch release, next week V3.1.0 minor release.
Apart from the above planned ...
2
votes
1answer
31 views
How to sync my fork and merge before sending pull request
I just started working with a pull and fork model. I keep sync my fork and create a new branch when I have to fix something or for a new feature.
I'd like to know what to do when I have to face the ...
2
votes
2answers
138 views
Is it good practice to switch back to an old branch to develop a new feature or to create a new branch?
I have an old branch (old-branch) which I last used approximately four months ago that I used to develop a feature for a specific project. It was never merged back into master because the feature ...
1
vote
1answer
29 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 ...
0
votes
2answers
136 views
1 commit to 2 branches - what does it mean?
I wanted to check commits to a branch, and I saw that there were commits that appear in 2 branches.
Why?
What does it mean?
-1
votes
1answer
58 views
Makefile: Dev and Release
In Git, I have a master branch (release) and a dev branch (development) for a C project.
In the master branch, I want gcc to only be passed the compiler flag -Os (optimize for speed) and not -ftest-...
1
vote
1answer
82 views
Reusing binary assets using Git
We have multiple projects that are using common binary assets (e.g. images, sounds, 3D models etc.) stored in a folder on a server. Right now, each project adds these assets to their git repository. ...
1
vote
1answer
91 views
Forking in Git - helps with merge conflicts?
We use a branching git workflow, but we have real issues with merge conflicts. None of us are git gurus so we always end up manually resolving the conflicts in an IDE which is error prone.
There has ...
2
votes
1answer
99 views
Working with maven and multiple git repositories
We recently migrated from SVN, with most code in a single repo, to git, with most projects in their own repos (about 70 of them).
We build about a dozen different apps from this java source. The apps ...
-1
votes
1answer
62 views
One person controls only one folder, in a repository
How can I give complete control of one folder to one person, while the rest is in the control of another person. Control means they have the power to approve pull requests and commit to master and ...
4
votes
2answers
205 views
Is there a recommended Git branch strategy for two products in the same repo?
My team has a Git repo for a large service that incorporated a related, but fairly unique, micro-service. We recently decided to separate out the micro-service into its own service in terms of release ...
5
votes
1answer
257 views
Steps to convert multi-repo to mono-repo
What are the best steps to convert multi-repos to a mono-repo?
This is what I have so far:
for each repo, check out the most recent branch (integration branch, usually)
for each repo, copy the repo ...
1
vote
2answers
149 views
Storing config in source control, but a different version for each developer
We have a developer toolchain, governed by a config file. Each developer can have their own version of the config file. What is a good way to store separate versions of that config for each developer ...
4
votes
1answer
192 views
How to have multiple source copies of a dependency in a C# git project?
In our company, we develop information system software in C#.NET, which has client-server-module architecture. Module project does not depend directly on server/client project, but only on shared ...
0
votes
0answers
22 views
npm subfolders and git submodule
So I'm wondering how I should go about this.
I have a frontend and a backend that's currently meshed together as one git repository. I would now like to separate them into a front end repository and ...
0
votes
1answer
53 views
Process for archiving binaries from different repos using Git?
Working in the embedded systems space, our products usually require multiple binaries for each of the microcontrollers within a single product. Using SVN previously, we would bundle validation and ...
1
vote
3answers
127 views
Git one repo dependent on another
I have a git repository that is built with one library and during compiling the library is switched for another to get 2 versions of compiled code for 2 different libraries. (different versions of the ...
2
votes
1answer
104 views
How to review hundreds of commits and formalize merge request(s)
At my work every line of code must be reviewed and this review is formalized in a merge request.
Now we are a facing a situation were one developer developed a prototype for a new product which is ...
1
vote
3answers
95 views
Waiting on Multiple GitHub PR Merges
Scenario: I fork a project and submit a PR on Feature A, and then another on Feature B. I want to continue working with both features while I'm waiting for the PRs to be merged (theoretically they ...
-1
votes
1answer
33 views
how to merge or update a template repository?
I have a template repository consisting of a folder structure, scripts, makefiles, example files (text templates) etc.
The easiest way would be to clone the repo, delete the .git folder and create a ...
1
vote
2answers
129 views
Managing git repository
I don't know if I am over-complicating stuffs but here is our setup.
3 Code hosting servers (QA, Stage, and Production)
3 main git Branches (dev, stage and master) for respective servers
10-15 ...
-1
votes
1answer
100 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
vote
1answer
48 views
Benefit of using JIRA issue key in fork based workflow
My team follows the practice of including JIRA issue key in each of our commits and also in the title of a Pull Request.
Each developer usually make changes in a branch on his/her own fork and then ...
2
votes
1answer
96 views
How to reduce the chances of getting merge conflicts occurring in two projects of same cloned codebase
I have two applications A and B.
Application A was written before application B, actually B was initially the same fork of A thus, each of the application had the same modules and same code in it.
...
1
vote
1answer
106 views
Multiple git users
On GitHub if I want to contribute to another user's repo I clone it, make changes and submit a PR, at which point the owner can choose to merge or not. I am trying to figure out how to create a ...
4
votes
1answer
304 views
Using Gitflow and Semantic Versioning: How to avoid version number conflicts when merging?
I want to use gitflow in combination with semantic versioning. In gitflow, you bump version numbers on every release or hotfix branch. This inevitably leads to version conflicts if a new development ...
213
votes
13answers
35k views
New developer can't keep up with branch merges
I am the new developer - this is my first programming position.
My issue is this: We use git - I cut a branch from our develop branch, then I start working on the minor task I've been assigned. It's ...
5
votes
1answer
174 views
What to do with historical SVN branches after switching to GitFlow?
I am part of a team that has recently moved from an SVN repository to a Git repository, and have started using GitFlow.
As I understand it, this means that in a perfect world, the minimum number of ...
1
vote
3answers
195 views
It is good practice for each project (within a directory) to be split out into its own repository?
I am new to Git and am learning as much as I can about it.
The latest thing I would like to know is how to approach this problem: I have a single folder (R) that I initially set up as a Git ...
1
vote
1answer
176 views
How do I manage a development journal?
I am working solo on small development projects on my own time, using Git. For each project, I like to have a development journal which is associated with that project and not associated with other ...
1
vote
1answer
30 views
Workflow for contributing to Python libraries under virtualenv
Let's say that I want to contribute to thislib, which is a Python library that is available as a Git repository. Several applications, such as thislib_app utilize this library, and I want to ...
1
vote
3answers
165 views
Should I commit every change before switching branches or is stashing the best option?
I am new to git and am currently trying to learn as much as I can about it.
I think the concept of it is fantastic and extremely valuable to any developer's workflow.
I am a data scientist who ...
-1
votes
1answer
162 views
A simple GIT workflow for tiny team
I've just joined a project that a developper has been working on solo for 15 years. This is the first time he's had someone collaborate on a project. I've just convinced him we need version control on ...
0
votes
0answers
35 views
Git aware prompt - last remote udpate
I found that the various git prompt extensions lack one feature, it is to show how long ago the information from remote was last fetched ( with git pull or git remote update for example), so that we ...
1
vote
1answer
146 views
We're having some deployment issues with Git Flow
We support multiple umbraco websites for a client.
We have our local dev env, staging and live for each of them. Some time ago we started building and deploying all the websites with appveyor.
...
2
votes
2answers
100 views
Commit code transformations in git
Is there a way of committing code transformations or refactorings in git, perhaps as metadata for an actual commit, so that code editing tools can apply the change as a conceptual transformation ...
5
votes
1answer
192 views
What is considered best practice around using git / VCS's when doing a complete code rewrite?
I am a data scientist who programs in R, but am relatively new to using version control (yes, I know!) and I am still learning lots about it.
FYI: I use BitBucket and Sourcetree
I understand the ...
1
vote
1answer
92 views
Automatically merging a fork to the master
I am trying to setup a flow in Git but I have no clue on how to start on it.
We have a master which will be forked by some teams.
When the teams are done, they will issue a pull request to the master.
...
