| by Arround The Web

Fixing git/github merge conflicts

Introduction In our previous article on the git version control system, we explained how we could modify our files in repositories in our GitHub account and then pull the changes from GitHub to the git repositories on our local system and keep the files in synchronization. Now, what if we modified the same piece of […]

The post Fixing git/github merge conflicts appeared first on The Linux Juggernaut.

Share Button
Read More
| by Arround The Web

Pulling changes from GitHub to Git

Introduction In our previous article, we demonstrated how we would push our git repositories from our local system out to GitHub. In this article, we will demonstrate how we would actually make changes in a file within a repository on GitHub and then pull the changes/updates to our local machine.   Demonstration: I’ll continue to […]

The post Pulling changes from GitHub to Git appeared first on The Linux Juggernaut.

Share Button
Read More
| by Arround The Web

Git branches continued

Introduction In our previous article, we introduced you to the concept of branches in git. We explained what are branches and demonstrated how we could create a branch, switch to a different branch and delete a branch. In this article we will demonstrate how we use branches to prototype our work while keeping a functioning […]

The post Git branches continued appeared first on The Linux Juggernaut.

Share Button
Read More
| by Arround The Web

Git branches explained

Introduction Thus far we’ve explored different features of the GIT version control system like viewing a log of the git commit history, viewing differences between staged and committed versions of files. We also explained the concept of HEAD and explored how we could use the git checkout command to revert to previous versions of files […]

The post Git branches explained appeared first on The Linux Juggernaut.

Share Button
Read More
| by Scott Kilroy

Intro to Git

If you’re new to Git checkout https://www.linuxtechi.com/learn-git-command-examples-linux-part-1/ it’s a good starting point.

Share Button
Read More
| by Scott Kilroy

Misc git tips

Want to see if your branch is on the remote server? Want to see what branches are? Run git branch -av Not seeing your branch on the remote server, run git push origin BRANCH_NAME Added a file to .gitignore but you already checked it in? Run git rm –cached FILENAME Changing your origin server? Run git remote remove origin

Share Button
Read More
| by Scott Kilroy

Configuring git

git config –global user.name “USER_NAME” git config –global user.email “USER_EMAIL” and if you work with Windows files git config –global core.autocrlf false

Share Button
Read More
| by Scott Kilroy

Git – A better way to manage git with multi-users

Create a directory to store all your repos.  I like putting them in /var/git-repos cd into /var/git-repos (or whatever you called it) mkdir PROJECT_NAME.git cd PROJECT_NAME.git git init –bare Then Each user works locally (could be on their own system or could be in a personal directory on the same server). Run the following: mkdir PROJECT_NAME cd PROJECT_NAME git init if working on the same server you could use git remote add origin /var/git-repos/PROJECT_NAME.git if working remotely you could use […]

Share Button
Read More
| by Scott Kilroy

Git – problems with first push

No refs in common and none specified; doing nothing. Perhaps you should specify a branch such as ‘master’. fatal: The remote end hung up unexpectedly Just run git push origin master Or if you get error: src refspec master does not match any. just do git commit -m “initial commit” git push origin master

Share Button
Read More
| by Scott Kilroy

Moving from Subversion to Git

Follow this guys instructions http://daneomatic.com/2010/11/01/svn-to-multiple-git-repos/

Share Button
Read More