Keeping git repositories on different hosts in sync
I am thinking about starting a small project and I want to make its versioning with git.
How to merge a release branch into main with many conflicting commits while keeping Git history clean?
I am dealing with a git repository that has a lot of conflicts between development and main. Git indicates there are 1000+ commits when merging the two, while in reality it should be around 40.
How can a beginning programmer begin to learn and apply testing best practices when developing software? [duplicate]
This question already has answers here: Unit testing best practices for a unit testing newbie (4 answers) Closed 9 years ago. While learning to develop in PHP it has been easy enough that my short, one page, 20 line little scripts I could add “testing code” directly to my functions to figure out where I […]
How do distributed version-control systems deal with fragmentation?
Here is the scenario:
So I’m a developing a workflow with vagrant+git…does this make sense?
Relevant Background Details
how safe/sane is it to use git for deployment on my webapp production server?
I started with sftp, then switched to WebDAV and I’m currently using rsync through ssh to deploy any updates/upgrades from my development server into my production server.
Solution with multiple projects and (GitHub) single issue tracker and repository
I have a Visual Studio solution with multiple projects:
Working with Multiple Versions of Websites (Git)
I have a main template like website I have made that will allow me to quickly roll out and make new websites on demand when I need them, for my personal use.
Using gerrit (or similar tool) on a team where multiple devs work on a single feature
We have a team of roughly ~8 devs who regularly work on the same feature over the course of a 3 week sprint. It isn’t quite pair programming, but in our current workflow devs regularly push up incomplete code for a colleague to complete. This worked fine before we introduced Gerrit, but now our commits need to represent chunks of test-passing, complete, logical functionality, and so the model breaks.
Best github repository layout for snippets in multiple programming languages [closed]
Closed 8 years ago.