github - what does this git code that I use for merging my branch with master branch actually do? -

-

i'm new , understand of how i'm using it, when want merge master , add changes don't what's going on.

this flow:

first edits , commit them my-branch. do

git checkout master git pull origin master git checkout my-branch git merge master

so think in first line

git checkout master

i'm switching master branch. i'm not entirely sure means. think means if commit @ point change master directly. know files stay in same shape , maintain of edits.

then, have no idea second line

git pull origin master

in third line

git checkout my-branch

i'm switching my-branch (again, not entirely sure of implications).

then, finally, merge two.

git merge master

i have no idea unmerged files are, when initiate pull request on git website see nice diff.

i'm bit confused why i'm initiating on website "pull request" because seems more commit.

git checkout master

this switches master branch. changes committed in my-branch, not in master removed, , changes committed in master not in my-branch applied repository. yes, if started changing , committing files now, altering master.

note changes you've made while in my-branch have not yet committed stick around. can cause conflict if commits in branch you're switching make changes same places. if there conflict, git won't let switch branches until either commit changes, or stash them.

git pull origin master

this 2 things:

  1. it fetches changes origin, i.e. downloads them local branch set track remote branch. local remote-tracking branch isn't interact with, it's handled automatically git. in fact, won't shown git branch --list.
  2. it merges changes master. sometimes, may have perform manual merging if git cannot figure out how safely itself.

note doesn't initiate "pull request". it's called pull because it's pulling remote changes local repository. pull request asking else pull you.

git checkout my-branch

this same previous checkout, in opposite direction.

git merge master

this merges changes master has, my-branch not, my-branch. thus, my-branch has master has, master does not have new changes my-branch.


Comments

Post a Comment

Popular posts from this blog

How to show in django cms breadcrumbs full path? -

-
need advice - how show in breadcrumbs whole path article or page? i've got code: {% ance in ancestors %} <li> {% if not forloop.last %} <a href="{{ ance.get_absolute_url }}">{{ ance.get_menu_title }}</a> {% else %} <span class="active">{{ ance.get_menu_title }}</span> {% endif %} </li> {% endfor %} but shows "home" , current page. how modify show whole path in breadcrumbs? i've found in file menu_tags.py code calls ancestors. @ least there class showbreadcrumbs: class showbreadcrumb(inclusiontag): """ shows breadcrumb node has same url current request - start level: after level should breadcrumb start? 0=home - template: template used render breadcrumb """ name = 'show_breadcrumb' template = 'menu/dummy.html' options = options( argument('start_level', default=0, require...
Read more

php - Invalid Cofiguration - yii\base\InvalidConfigException - Yii2 -

-
Image
i've installed yii2-user module/dektrium yii2-app-basic application command composer require "dektrium/yii2-user:0.9.*@dev" config/console.php return [ . . 'modules' => [ 'gii' => 'yii\gii\module', 'user' => [ 'class' => 'dektrium\user\module', ], ], . . ] config/web.php 'components' => [ . . /* 'user' => [ 'identityclass' => 'app\models\user', 'enableautologin' => true, ], */ 'modules' => [ 'user' => [ 'class' => 'dektrium\user\module', ], ], . . ] after that, run command $ php yii migrate/up --migrationpath=@vendor/dektrium/yii2-user/migrations updating database schema . but, when run http://localhost/mylawsuit/yii/web/index.php?r=u...
Read more

ruby on rails - npm error: tunneling socket could not be established, cause=connect ETIMEDOUT -

-
i have app uses rails framework , implements angularjs part of front end. i have pushed heroku , have heroku toolbelt installed, when try migrate db using "heroku run rake db:migrate" receive following error(s): installing core plugins heroku-cli-addons, heroku-apps, heroku-fork, heroku-git, heroku-local, heroku-run, heroku-status... error installing package. try running again gode_debug=info see more output. ! `run` not heroku command. ! perhaps meant `-h`, `2fa`, `auth`, `join`, `open`, `orgs`, `pg`, `ps` or `rake`. ! see `heroku help` list of available commands. i run command "gode_debug=info heroku run rake db:migrate" , receive error: npm err! darwin 14.5.0 npm err! argv "/users/christopher_pelnar/.heroku/node-v4.2.1-darwin-x64/bin/node" "/users/christopher_pelnar/.heroku/node-v4.2.1-darwin-x64/lib/node_modules/npm/cli.js" "install" "heroku-cli-addons" "heroku-apps" "heroku-fork...
Read more