Stream

Join this community to post or comment

Lars Moelleken

Discussion  - 
 
Writing good commit messages via commit-template:

- To speed up the reviewing process.
- To help us write a good release note.
- To help the future maintainers (it could be you!), say five years into the future, to find out why a particular change was made to the code or why a specific feature was added.

https://github.com/voku/dotfiles/wiki/git-commit-messages

23
8
Add a comment...

Reval Govender

Discussion  - 
 
 
Hey guys, I created a blog post to go along with my Git Flow video. Please bookmark it for your reference.

http://www.revgov.co.uk/blog/tutorial-what-is-git-flow
What is Git Flow. Git Flow is a set of guidelines developers can follow when using version control. It is often referred to as a “Branching Model” for not only Git, but for all methods of version control. Please remember, that Git Flow is not a set of rules that you have to follow.
1
pixel fairy's profile photoReval Govender's profile photo
2 comments
 
Unsure why it played at 1.25x speed by default. This was the first video I made and I did speak very slow anyway so it should not have hurt too much. I will look into this, thanks for letting me know. Have an awesome day!
Add a comment...
 
I like the comparison of isolated codebases to the Galapagos ecosystem! 
GitHub is a wonderful resource for programmers looking to improve their skillset. Although we often struggle to find the time to commit to opensource, even by simply reviewing code we can improve ourselves.
12
3
Add a comment...

Jaden Weiss

Help Me  - 
 
I have been contributing to a project called Ravi, and just ran into a problem.

I first had forked it and added 32 bit number support and sent in a pull request. It might be a while before that is merged.

Then I created another branch to add ccache for travis-ci. I want to send in a pull request just for the travis changes, but that branch also has the commits for the 32-bit number support. The ccache branch will probably be merged before the 32-bit number branch.

What is the easiest way to resolve this?
1
Jaden Weiss's profile photoAvinash Ananth Narayan R's profile photo
6 comments
 
Rebase the ccache branch onto master

git checkout ccache
git rebase --onto master 32bit ccache

This is explained at https://git-scm.com/docs/git-rebase in detail. Just search for onto in page.
Add a comment...
 
 
#github  and #google  recently released the Github Archive dataset on #BigQuery . So it's possible to analyze tons of code repositories, and make interesting stats about them. For the fun, and to learn a little bit more about +Apache Groovy, I decided to run my own queries, to discover which packages or AST transforms were the most frequent, what's the size of Groovy scripts and classes, are aliased imports being used, etc. So here are my findings!
Github and Google recently announced and released the Github archive to BigQuery, liberating a huge dataset of source code in multiple programming languages, and making it easier to query it and disc...
7
1
Philip Durbin's profile photo
 
Nice. Listening to http://5by5.tv/changelog/209
Add a comment...
 
What would be the preferred way to introduce git to people who hasn't used any version control in their lives?

The reason I'm asking is because I need to teach some of my new colleagues about git. And I'm preparing a simple course for them to follow.
3
Alec Clews's profile photoSitaram Chamarty's profile photo
22 comments
 
+Avinash Ananth Narayan R
Sadly no, I just wing it.  A lot of the immportant stuff is in pictures -- and that's my excuse ;-)
Add a comment...

Galhi Ali

Help Me  - 
 
What is the best way to resolv merge conflicts


1
Lubomir Rintel's profile photoCaleb Cushing's profile photo
19 comments
 
Depends on the conflict but, Intellij Idea does have a reasonable UI way of resolving conflicts, otherwise I tend to use mergetool, or just manually merge with the editor.

These days I tend to structure code and use branches in a way that avoids conflicts. Basically more/smaller classes following single responsibility with short lived topic branches to avoid people working in the same classes at the same time.
Add a comment...
6
3
Diego Núñez Silva's profile photoTheo Debrouwere's profile photo
4 comments
 
+Diego Núñez Silva​ simple: this is clickbait. Huge page, lots of adds, close to no content. There isn't any intention to help people, the owner just wants income. And these pages are posted on G+, hoping that people will visit them, so the rise in google rankings. 
Add a comment...
3
1
Add a comment...
 
Here's a comparison of merge applications for Git. It's put together by the community with pros and cons for each option. Hope you find it useful. :)
Get the answer to "What are the best merge applications for Git?" See a list of the top 7 options and learn their pros and cons.
20
8
Yuri Khan's profile photoПавел Кулёв's profile photo
3 comments
 
magit-ediff-resolve
Add a comment...

Created by

About this community

A place for user-to-user engagement of Git version control system.
 
Rather than me ask far too many questions of someone. Does anyone have a bookmark to a detailed blog post of how web developers work with git from a web front end developer point of view - ie their workflow - where is their git server, how do they test changes they make - do they copy it to a dev server, then how do they deploy live and control that etc

1
Saeed Sarpas's profile photoNick Thorley's profile photo
4 comments
 
+Saeed Sarpas what would you like more specifics on? I just wanted the general management of a process for a web developer on a lamp stack. Open file from git, work on it, save / commit it and then copy it to the live server.
Add a comment...

Jordan Cohen

Stories (success or horror)  - 
 
Just tried to setup auto signing each commit. Got super stuck on auto entering the gpg passphrase and eventually gave up.

That was way way too hard to do.
1
Bruce Fields's profile photoJordan Cohen's profile photo
6 comments
 
Why wouldn't I? 
Add a comment...

Arios Tew

Help Me  - 
 
I am trying so many solution for solve this problem. This scenario is, i have a hostgator hosting and i want to use git(Source tree) to clone my project down. Therefore, when i change those files, i can check back and after push it will update on the site.

http://www.arlocarreon.com/blog/git/push-git-repo-into-shared-hosting-account-like-hostgator/
How do I create a git repo on my shared hostgator?
I have try these method, add my machine RSA key into hosting. But my real problem is cant download it. Is that possible to clone it and when push it will update the website?


I get few error:

$ git clone --bare **@****.com:public_html/.git
Cloning into bare repository 'public_html.git'...
Connection closed by xxx.xxx.xxx.xxx
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.


$ git clone ssh:// **@****:public_html/
Cloning into 'public_html'...
ssh: Could not resolve hostname **@****:public_html: Name or service not known
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
Does anyone solve before this question? Or is not possible to use it on sourcetree or github?
1
Martin Zeitler's profile photoBart Massey's profile photo
9 comments
 
http://github.com/BartMassey/mkgit is one possibility if you have ssh access to your HostGator. Configure it to keep your stuff wherever you have write access there, then "mkgit -Xmyhostgator". It's a work in progress: file an issue report if you find a problem, and I will try to fix it.
Add a comment...

Coding Defined

Discussion  - 
 
Frequently asked questions on Git
#git   #github  
9
4
Add a comment...
 
Can anyone suggest a good online resource for a web developer / sys admin who is new to git to learn the basics through to advanced
1
1
Idriss Bellil's profile photoPiotr Solarczyk's profile photo
20 comments
Add a comment...

Boris Serebrov

Discussion  - 
 
I use this git workflow for few years and find it relatively easy to use even for beginners. Today I put it together into the blog post and I hope it will be useful to others too - "Simple Git Workflow" http://serebrov.github.io/html/2016-07-03-simple-git-workflow.html
The main purpose of this workflow is to have a reliable, but simple to use git workflow. It is simple enough to be used by git beginners and minimizes possibility of mistakes (comparing to advanced flows which use rebase and related git features to achieve clean history).
31
8
Bart Massey's profile photoBoris Serebrov's profile photo
3 comments
 
+Bart Massey Thanks for the feedback and "checkout -t" looks better for me too, I didn't know that it can be used together with "-b".
Add a comment...

Andrea Navarro

Discussion  - 
 
¿Claves primarias autoincrementales o UUID?
Aquí las ventajas y desventajas de utilizar UUID como clave primaria de tus tablas.
‪#‎mysql‬ ‪#‎uuid‬ ‪#‎basededatos‬ ‪#‎sql‬ ‪#‎database‬ ‪#‎autoincremental‬
 ·  Translate
1
Javier Novoa Cataño's profile photo
 
What does this have to do with git???
Add a comment...

Reval Govender

Discussion  - 
 
I take you through exactly what Git Flow is and how to apply it to a team. 
19
7
Reval Govender's profile photoFarhan Rahman's profile photo
10 comments
 
One thing that the flow doesn't cover and thats something that might not be directly related to it is patch based integration. So one thing that gerrit provides with jenkins integration for example is reviewing and testing a patch before it is merged into develop. Its almost the same as "merging to develop and if it works then merge it to master" kind of a flow. The problem with that kind of a develop->master merging is if someone breaks the develop branch, the development flow is stopped, until someone fixes it. The master branch is still fine.

I still haven't seen support for that kind of work in github or bitbucket with bamboo. The ideal flow would be the git flow you described and on top of it something like this:

1) You have some commits ready and you submit a patch to be tested in the CI server.

2) If the tests pass you go through review.

3) Once the reviewer has said its okay, the patch is merged into develop

The steps 2 and 3 are optional. If the integration fails, the patch isn't merged into develop.

This way you always have a working develop branch and the rest is the same. You merge an always working develop branch into master. I still have to find a way of doing this with github. I have seen a jenkins plugin which does something like that but I haven't tested it. Maybe it might be worth writing a plugin if thats not the case.
Add a comment...

Jakub Narębski

Discussion  - 
 
A bit of shameless self-promotion: Packt have published a new book, "Mastering Git" on April 2016.
Git is one of the most popular types of Source Code Management (SCM) and Distributed Version Control System (DVCS). Despite the powerful and versatile nature of the tool envel...
27
8
Add a comment...