Git - Working on Existing or Cloned Project

by prashere 9 years ago

GNU/Linux ◆ xterm-256color ◆ bash 661 views

So you have cloned a git based project to work on. This cast will just guide you through how to edit some files on that project, add your contributions, commit and then push it to the main repository.

Navigate to the project directory using cd command.
You are making some changes to a file and saving it.
You have tell git that, you have made some changes, so you have to add and then commit you changes with git. You can use git status command to check now and then.
By the time you are editing this file, there is a very high chance that someone is also editing the same file and have pushed new changes to the main repository.
If you try to push, it will say, git cannot push the changes since there are new changes on the repository, which you have pull first.
So it is always a best practice to pull the changes first before pushing your changes.
You can use git pull and the branch name to pull the changes.
If there are any new updates, it will be synced with your local project along with your changes.
While pulling there is also a chance that you and someone else edited the same line in the same file. In that case it is called ‘conflict’. That is git is now confused. It doesn’t know which change it should keep / delete. So it will ask you to resolve the conflict manually. In this cast, you won’t find any conflict and so we are not dealing with it right now.
Final step is to push your changes to the main repository.

-> You edit a file -> git status -> git add -u -> git commit -m “Some meaningful description about the changes you made” -> git status -.> git pull –rebase origin -branchname- -> git push origin -branchname-

More by prashere

untitled 01:51

by prashere 9 years ago

Script for Starting and Stopping B.A.T.M.A.N Advanced 01:58

by prashere 8 years ago

Virtualenv for Python development 05:10

by prashere 11 years ago

Blogging With Pelican - 1 04:53

by prashere 8 years ago

See all

You can download this recording in asciicast v1 format, as a .json file.

Download

Replay in terminal

You can replay the downloaded recording in your terminal using the asciinema play command:

asciinema play 18358.json

If you don't have asciinema CLI installed then see installation instructions.

Use with stand-alone player on your website

Download asciinema player from the releases page (you only need .js and .css file), then use it like this:

<!DOCTYPE html>
<html>
<head>
  <link rel="stylesheet" type="text/css" href="asciinema-player.css" />
</head>
<body>
  <div id="player"></div>
  <script src="asciinema-player.min.js"></script>
  <script>
    AsciinemaPlayer.create(
      '/assets/18358.json',
      document.getElementById('player'),
      { cols: 134, rows: 39 }
    );
  </script>
</body>
</html>

See asciinema player quick-start guide for full usage instructions.

While this site doesn't provide GIF conversion at the moment, you can still do it yourself with the help of asciinema GIF generator utility - agg.

Once you have it installed, generate a GIF with the following command:

agg https://asciinema.org/a/18358 demo.gif

Or, if you already downloaded the recording file:

agg demo.cast demo.gif

Check agg --help for all available options. You can change font family and size, select color theme, adjust speed and more.

See agg manual for full usage instructions.