Skip to main content

All Questions

Tagged with
2 votes
2 answers
293 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 ...
Joshua's user avatar
  • 129
1 vote
2 answers
108 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 ...
ShinEmperor's user avatar
0 votes
1 answer
890 views

What is the purpose of keeping "open" a merged MR in Gitlab?

In gitlab, there is Merge Requests (MR) like in github there is Pull Requests (PR). If the MR is rejected, sure, we close it. But what if the MR is merged ? In that case the button to close the MR ...
Rémi Becheras's user avatar
8 votes
2 answers
8k views

Should I have a 'dev' branch separate from a 'production' branch?

I recently set up my staging and production server environments on Heroku and everything is working great. Through Heroku, you can deploy from a Git branch - e.g. master or my-feature. This got me ...
Chris Cirefice's user avatar
0 votes
1 answer
137 views

Upgrading inherited 3rd party code with changes [closed]

I inherited a php project of 3rd party code with a good deal of company-specific customization lumped on top of it. Now I've got to upgrade it and the person who owned the project is the one I've ...
Peter Turner's user avatar
  • 6,945
0 votes
1 answer
2k views

Strategy for maintaining offline repository safely using git [closed]

I use git for versioning. Just yesterday I was working on refactoring my Python code base. After adding a test I found that I had introduced a bug in one of project euler solutions. So I checked out a ...
Aseem Bansal's user avatar
  • 3,024
0 votes
1 answer
400 views

How do I properly add a reference from my Github project to someone elses in VS2013 on Windows 8?

I need to reference the latest version of Bouncy Castle in a project I intend to publish to Github. In my first posting of the code to Github, someone complained that I downloaded the entire Bouncy ...
makerofthings7's user avatar