Stream

Join this community to post or comment

Coding Defined

Discussion  - 
 
How to solve Fatal: Not a git repository
#git   #error   #github  
1
Add a comment...
 
Here's a crowdsourced comparison of git clients for OSX. There are 15+ options compared and each option has pros and cons written by the community. Any reasons to choose one option over another that are missing from the comparison?
Get the answer to "What are the best Git clients for Mac OS X?" See a list of the top 16 options and learn their pros and cons.
3
1
Shawn Matthiessen's profile photodiane bowser's profile photoMartin H. Sluka's profile photo
5 comments
 
Great article especially for those wrestling with whether or not to use a gui to see branches/commits visually depicted.  I love the command line, but seeing branches once in a while is fun too.
Add a comment...

Kevin Jahns

Help Me  - 
2
2
Caleb Cushing's profile photoKevin Jahns's profile photoBennett Piater's profile photoTim Morley's profile photo
3 comments
 
If you haven't already made up your mind, you definitely should give the article a read. Especially if you work with collaborators
Add a comment...

Caleb Cushing

Stories (success or horror)  - 
 
Turns out a lot of people don't realize that git.git has documented their own workflow, you can read it locally `git help workflows` or online here. Read it before making workflow decisions so you understand the difference between it and the other workflows people have proposed. 

https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html
This document attempts to write down and motivate some of the workflow elements used for git.git itself. Many ideas apply in general, though the full workflow is rarely required for smaller projects with fewer people involved. We formulate a set of rules for quick reference, while the prose ...
22
6
Giovanni Cimmino's profile photoTomasz Nowak-Bańdura's profile photo
Add a comment...
 
How I must to INITialize a GIT REPOSITORY  NON BARE???
1
Steve Savitzky's profile photoPaolo Francesco BERTOLOTTI's profile photo
15 comments
 
TNX ALL!
Add a comment...
 
 
Another edition of Git Rev News!
Git Rev News: Edition 5 (July 8th, 2015). Welcome to the fifth edition of Git Rev News, a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see the Git Rev News page on git.github.io. This edition covers what happened during the month ...
1
Add a comment...
 
Hello everyone,
I started programming Java one month ago.
Therefore I use Eclipse as a IDE.
I have different workstations and operation systems.

I'd like to synchronize all my project files via git.
I already have a gitlab and github account.
Which one do you prefer, and which steps do I have to take, to sync all my files? Do you have a greate tutorial for me?

And which git commands are for beginners like me necessary?
1
Jeff Cave's profile photodiane bowser's profile photo
4 comments
 
Read through this page as there are some great recent posts with resources for beginners. Also check out http://www.gitguys.com/.

Three quick tips:
1. Learn git from the perspective of your local machine versus the remote repository. Once you understand how things happen on your machine, the repository becomes easier to manage & understand.

2. Use the cheat sheets, but also consider a more in depth source such as a text or video course once you have the basics down.

3. Learn the command line tools first and then download a GUI client to see your repositories. Doing it the other way around may actually hinder your ability to 'think like git.'
Add a comment...

Xah Lee

Discussion  - 
 
#git is there any tech consequence of not setting name and email? i.e. does it prevent push or something?
1
1
Xah Lee's profile photoYuri Khan's profile photoMyaBabe Gt's profile photo
7 comments
 
In the old mainframe times, when you got a shell account username on a UNIX server hostname.domain, you automatically got a mailbox username@hostname.domain and web hosting under http://hostname.domain/~username.

Nowadays, combining the local user name with the hostname, even if it is fully qualified, on a machine where you do development, is unlikely to yield a working email address.

Therefore, prefer always having your ~/.emacs and your ~/.gitconfig with you.
Add a comment...

Joe Ford

Discussion  - 
 
No good for seasoned Git experts but a free resource to any Git noobs you know!
 
New to Git?
Learn the basics with this free downloadable PDF. Includes a guide to getting started and a Git cheat sheet of commands.

Download here: https://www.clearvision-cm.com/git-101-guide/
5
1
Scott Furry's profile photoJoe Ford's profile photoPaul Grove's profile photo
4 comments
 
+Scott Furry I see your point and you can never really put a price on your data, but this download won't strictly 'cost' you anything. I'm arguing semantics, it's your call sir! Thanks for understanding.
Add a comment...

Created by

About this community

A place for user-to-user engagement of Git version control system.

Clearvision-CM

Discussion  - 
 
We put together this quick blog with some info on the latest scare about public .git folders and how to fix it. Hope it helps!
It's being called "the biggest hole in the internet" - why you need to check your .git folder to avoid exposing your sensitive data.
3
1
Caleb Cushing's profile photoRichard Maw's profile photoHepha Cheng's profile photo
4 comments
 
Having some form of version control isn't a terrible idea. Conflating configuration version control with source version control is likely to lead to erroneously making the credentials visible somewhere they shouldn't be.

By "rolling your own" I meant that you shouldn't assume you know enough about how to provide credentials without doing a sufficient amount of research to decide whether you'd be better off using someone else's library.

It's not simple, and not passing it in on the command line is merely the first step.
Add a comment...

Nicola Paolucci

Discussion  - 
 
After some gestation and polish my new video course "Git Power Routines" is online #git  
Follow along or just sit back and enjoy a live, hands on tutorial on the power routines of experienced git users. We'll explore with real world examples how to amend commits, do an interactive rebase - and why would you want to do one in the first place, how to solve conflicts without any merge ...
7
3
Kirill Palamartchouk's profile photoAlex Pacheco's profile photo
Add a comment...
 
hello my name is braulio. i want know why and how this error. happy day.


Auto-merging carpetauno/principal.php
CONFLICT (content): Merge conflict in carpetauno/principal.php
Automatic merge failed; fix conflicts and then commit the result.
1
Yuri Khan's profile photo
 
You have a merge conflict which Git cannot resolve on its own.

This happens when you change some section of code and try to merge a branch in which someone else (or you) changed that same section. (Similar types of conflicts arise if you rebase or cherry-pick commits which change a section of code onto a branch where that same section was changed; or if you try to apply a patch which changes a section of code which has been changed since the patch was generated.)

To finish the merge, you need to:

1. for each conflicting file:
1a. open it in an editor;
1b. for each conflict marked with <<<<<<<, |||||||, ======= and >>>>>>> markers:
1b1. given the original code and the modified code on both branches, make a decision as to what it should look like with both changes;
1b2. replace the conflict with your merged version;
1c. save the file;
1d. `git add` file;
2. `git commit`.

If at step 1b you don’t get a three-way but only a two-way diff, you might want to `git merge --abort`, then set `git config --global merge.conflictstyle=diff3` and then retry the merge.

Note also that merge is invoked by default if you `git pull`. Avoid pulling blindly; instead, first `git fetch`, then browse the commit graph and decide whether you want to merge, rebase, or abandon your branch.
Add a comment...
 
[PT-BR]Mais um artigo da série Git e nesse capitulo vem falando sobre stash a gaveta do git. Também fala sobre branch, muito importante para trabalhar em equipe. Confira :P
http://goo.gl/rMd9Wv
 ·  Translate
Nesse artigo vamos falar sobre organização e como trabalhar em equipe.
1
1
Marlon Cabrera Oliveira's profile photo
Add a comment...

GitMinutes

Discussion  - 
 
 
Episode 38 is out! This is part 4 from #gitmerge 2015. We talk to +Roberto Tyley about Git LFS combined with his BFG, +Nicola Paolucci from Atlassian about Git community, and Jameson Miller from Microsoft about Visual Studio Git integration.
This is the fourth part from our trip to Git-Merge 2015! If you cannot see the audio controls, your browser does not support the audio element. Use the link below to download the mp3 manually. Link to mp3 Listen to th...
4
1
Tomasz Nowak-Bańdura's profile photo
Add a comment...

Steve Smith

Stories (success or horror)  - 
 
Congratulations on 10 years Junio..
As Linus Torvalds has already pointed out, the 8th of July 2015 is the 10-year anniversary of Junio C. Hamano taking on maintenance of Git. And here at Atlassian we appreciate the excellent work he's done over that time. For the last 10 years Junio has been nothing but an exemplary project ...
8
1
Michał Sadowski (SQ6JNX)'s profile photo
Add a comment...
 
Hi folks
Is possible to create (from my local computer) a bare repository in a remote shared hosting service ?
In that hosting service I only have http access (no ssh)
Thanks !
1
Martin Zeitler's profile photoMichael Engelhardt's profile photo
2 comments
 
Never tried - but maybe it is possible to add a webdav reference as remote?
Add a comment...

GitMinutes

Discussion  - 
 
 
New episode! This is the 3rd part from Git Merge 2015. We talk to +Stefan Beller, Robert van Haaren and +Ævar Arnfjörð Bjarmason.
If you cannot see the audio controls, your browser does not support the audio element. Use the link below to download the mp3 manually. Link to mp3 Listen to the episode on YouTube Stefan Beller Google+ Robert van Haa...
6
1
Tomasz Nowak-Bańdura's profile photo
Add a comment...

jason c

Discussion  - 
 
https://www.sourcetreeapp.com/ somebody give me a tutorial on sourcetree. You don't need commandlines anymore! huzzah!
SourceTree is a free Mercurial and Git Client for Windows and Mac that provides a graphical interface for your Hg and Git repositories.
17
3
Gabriel Bernardi Almeida Vieira's profile photoMartin Zeitler's profile photoJohn Camacho's profile photoTomasz Nowak-Bańdura's profile photo

vince yi

Help Me  - 
 
I have a 'config.php' file in my local repository,which is different to  remote repository.
How could I keep local file different from remote repository file when i pull from remote repository?
1
Michael Geddes's profile photoman alejandro's profile photo
10 comments
 
$ git rm --cached config.php
Add a comment...