github with slack

Credits goes to Sudheer Kumar Tumarada for creating this article with clear explanation.

Introduction:-

Many of us already knew about GIT and Slack .These became  part of our daily life for team collaboration and code sharing .Here i just want to give brief introduction about them and how can we integrate both for better productivity and team collaboration.

 

Slack:-

Slack is a communication tool which allows us to get shared understanding across the teams which will makes us more productive.

1.It’s the foundation for teamwork

2.It simplifies communication

3.It helps everyone find the answers they need

4.It streamlines your work flows

 

Github:-

Github is system which will allow multiple developers/users to work on the same repository/code base.

 

Github-Slack Integration:-

We can have github-slack integration which will allow us to get the information about commits,pull request,deployment statuses and many more.

We can get the following notifications for the events done on our team repository :

• Commit events
• Pull requests
• Issue events
• PR review events
• Deployment statuses

 

We can connect Github to slack with following steps:

1)Visit GitHub in Slack’s App Directory.

2)Click Install.

3)Select a channel where GitHub events will be posted.

or click create a new channel to make a brand new one.

4)Click Add GitHub Integration.

5)Click Authenticate your GitHub account.

6)Choose the repositories you’d like Slack notifications for.

7)Choose the GitHub events you’d like to post to Slack.

8)If you’d like, you can customize the way Github posts appear in Slack by choosing a custom display name and icon.

9)When you’re done, click Save Integration.

Once you are done, you will start receiving notification in your slack channel.

Slack will automatically configure and manage which messages we receive from GitHub. To do this, we require write permission to your public and private repos.

 

If you’d prefer not to authenticate your GitHub account, you can switch to unauthed mode and manage the events yourself.

 

Advertisements

How to change pushed commit messages

checkout to the respective branch where you need to change commit titles..

git rebase -i HEAD~3 or 4 – depends on how many you need to check.

Goto the respective line or commit id where you need to change..

press ‘i’ – to insert

change ‘pick’ to ‘r’ – desired commit you would like to

change your commit message..

press esc button and type “:wq” and hit enter

After rebasing successfully..check log by ‘git log -n 3’ to see your changes. come out of this command by pressing ‘q’.

Now do ‘git fetch’ followed by ‘git merge’. Do not forget to press ‘i’ and esc + ‘:wq’

Finally git push origin HEAD

All the best

Working with Git from scratch

Git?? A big illusion for me from beginning is coming to an end today after an year thought process(never tried or implemented) 😛

Prerequisites:

1.Git installed in your machine

2.github account

I wont explain stories here..just before going to implementation lets know some basic commands..

Request to go thru this url..if not know some important concepts and commands that are listed below..

Important Git concepts

Here are the basic terms you should familiarize yourself with before embarking on your journey.

• Repository / Repo : This is the project’s source code that resides on github.com’s servers. You cannot modify the contents of this repository directly unless you were the one who created it in the first place.
• Fork : Forking a project will create a copy of the original repository that you can modify as you please. Forked projects will appear in your own github.com account.
• Cloning : this will clone an online repository to your hard drive so you may begin working on your modifications. This local copy is called your local repository.
• Branch : A branch is a different version of the same project. In the case of T2DMIT, you will see 2 branches : the master branch and the development branch.
• Remote : A remote is simply an alias pointing to an online repository. It is much easier to work with such aliases than typing in the complete URL of onlinerepositories every single time.
• Staging Area : Whenever you want to update your online repository (the one appearing in your github.com account), you first need to add your changes to yourstaging area. Modifying files locally will not automatically update your staging area‘s contents.

Important Git commands

• Fetch : git fetch will download the current state (containing updated and newly created branches) of an online repository without modifying your local repository. It places its results in .git/FETCH_HEAD.
• Merge : git merge will merge the modifications of another branch into the current working branch.
• Pull : git pull is actually a combination of git fetch and git merge. It fetches the information from an online repository‘s branch and merges it with your local copy.
• Add : Whenever you modify a file in your local repository or create a new file, that file will appear as unstaged. Calling git add allows you to specify files to be added to yourstaging area.
• Commit : A commit records a snapshot of your staging area, making it ready to bepushed to an online repository.
• Push : git push will take all of your locally committed changes and upload them to a remote repository’s branch.

Now lets config git initially..

Goto your project folder in your windows..say c:/workspace/myproeject/

Here first config git with your desired username and email like shown below

git config --global user.name "Your Name here"

This will be the name that shows up in the commits whenever you make a modification

git config --global user.email "your_email@domainname.com"

Make sure to enter the email address that is associated with your github account!

Now, from your command prompt(from your project folder)

c:/workspace/myproject/> git init //this will create .git in your project folder

c:/workspace/myproject/> git add –all //this will add all your files

wanna exclude a file/directory from your root folder?? then create a file and save as .gitignore extension. Once you create that just mention file name/folder name in that..

eg: node_modules folder need not commit right? then just mention node_modules in that file. Else a php file?? then

/config.php

If you want to add only a folder to your repository..you can try

git add foldername

c:/workspace/myproject/> git commit -m”first commit” // your commit message

So far, the above steps is what you would do even if you were not using github. They are the normal steps to start a git repository. Remember that git is distributed (decentralized), means you don’t need to have a “central server” (or even a network connection), to use git.

Now you want to push the changes to your git repository hosted with github. To you this by telling git to add a remote location, and you do that with this command:

git remote add origin https://github.com/yourusername/your-repo-name.git

Once you have done that, git now knows about your remote repository. You can then tell it to push (which is “upload”) your commited files:

git push origin master (or) git push -f (or) 

git push -f origin <branch> here branch is master

for delete a file from git repository..go to that specific folder and type ‘git rm file.ext’

With this you will be prompted for username and password in your command prompt..once you enter valid credentials..your files will be uploaded to your git account successfully. Thats it..you are done with your work and successfully uploaded all your project files to your account.

To clone from other desktop..try

git clone repository_name /path/to/localrepo/

Once clone is done..you can check files status with
git status
and pull all files using
git pull
if you are unable to pull files..try
git reset –hard and then git pull

Example:

git clone https://github.com/angular/material-start.git(your git repository url)
cd material-start (or) cd yourproject_foldername

Install Dependencies

We have two kinds of dependencies in any project: tools and angular framework code. The tools help us manage and test the application.

• We get the tools we depend upon via npm, the node package manager.
• We get the angular code via bower, a client-side code package manager.

We have preconfigured npm to automatically run bower so we can simply do:

npm install

Behind the scenes this will also call bower install. You should find that you have two new folders in your project.

• node_modules – contains the npm packages for the tools we need
• bower_components (or) app/bower_components – contains the angular framework files

Note that the bower_components folder would normally be installed in the root folder but material-start changes this location through the .bowerrc file. 

With this you cloned and install all dependencies that are required to run your project. Now you have to just run

grunt serve (or) grunt serve –force

check the .gitignore file, if the subdirectory/any directory is ignored.

You can configure git to your favorite editor sublime text and work with all git commands right from sublime editor. You can check this url to configure git in sublime.

Advanced git commands:

If you get some error like changes not staged for commit git or no changes added to commit (use “git add” and/or “git commit -a”). Then try below command

git commit -am "message"

Mac command to clear git credentials and force prompt to ask username and pwd

git config --system --unset credential.helper

How to add all modified files using git?
git add -u

How to add untracked files using git?
git add -i

Configure git inside of sublime text editor windows

Folks,

Lets see the configuration process that needs to be done in order to work with git commands in sublime text editor for workflow..

Prerequisites are

1. Git (command prompt only) – http://git-scm.com/docs

2. Sublime text editor

3. Sublime git package (refer https://sublimegit.net/#installation)

I hope with this you installed git and configured path in environment variables too..

Its better refer this url before you go with installation..

Now lets begin the show.. 😉

Steps:

I am directly moving to the configuration hoping you set the path for git and nodejs in environment variables which includes npm path in AppData too. Now run command prompt..

1. git config –global core.editor “‘c:/program files/sublime text 2/sublime_text.exe’ -w”

With this you can view .gitconfig file in C:/Users/username/ which should be as follows

gitconfig file:

[user]
name = sathya
email = sathya.vakacharla@gmail.com
[core]
editor = ‘C:\\program files\\sublime text 2\\sublime_text.exe’ -w

You can test it by app.js –edit in command prompt like

c:/project/folder/app.js > app.js –edit

this will open app.js file in sublime text editor

2. Now create a folder named sublimegit and extract sublimegit package in to C:\Users\username\AppData\Roaming\Sublime Text 2\Packages\SublimeGit

3. Now restart your sublime text editor

4. Now check your git commands in editor by going to command palette(ctrl+shft+p) and type add/push etc to show up with commands like git:Add etc.

5. How to add and commit and push to your remote git repository..

after changing necessary code in app.js..just goto command palette and type/choose “git add current file” then followed by “git quick commit” and “git push”

How to find the differences in versions of your files when you pull from git repository..

Sublime Text’s Git package offers several useful diff options, all available from the Command Palette (control+shift+p).

• “Git: Diff Current File”, which presents a diff of the current file and the last commit
• “Git: Diff “, which presents a diff of all files in your repository the last commit.

The diff will open up in a new file tab within Sublime Text. What’s nice is that there is syntax highlighting which helps you identify the additions and deletions.

Wanna view log??

Just type and select “Git: Quick Log” in command palette to view the latest log for the whole repository.

Blame:

Get an annotated version of the entire current file.
Commit
After adding files, commit them all with a message. (Close the file without saving it to commit)
Quick Commit
Add and commit the current file, after asking for a message.

Status:

Show the status of the repo. Chosing a file gives you a diff of it.

Refer Git Commands for sublime text editor here

Useful commands:

to clone from git repository or any shared path:

git clone git://git.kernel.org/pub/scm/.../linux.git my-linux

to check username/email/etc

git config --list

More Package control repositories for sublime text editor https://packagecontrol.io/

Useful links: https://github.com/kemayo/sublime-text-git/wiki

http://plaintext-productivity.net/2-08-how-to-set-up-git-and-sublime-text-for-version-control.html

git-cheat-sheet-education