version control - Committing Code in Git where branch is ahead of origin by one commit -


i have scenario working on qa environment. made changes source code using vi editor. want commit above changes branch , possibly push branch origin. @ first want commit changes.

here git status shows me:

git screenshot read using git -m "msg" .. can commit changes. not sure , other thing seeing message your branch ahead of 'origin/master' 1 commit not sure how proceed further. quiet new git , don't want break things. in case want me write command , paste output please let me know.

three stage thinking

in git, work source in 3 stages:

edit - add - commit

first, edit files. make changes files, output of git status change reflect modifications you've made. can view changes you've made far git diff.

next, add, or stage, work. stage of changes particular file git add <file>. again, output of git status change reflect you've staged. can view changes have staged git diff --cached.

last, commit changes. when run git commit, whatever files have staged bundled commit. commit includes snapshot of repository, commit message, time, , author. can view commits git log. git log -p in particular show changes made in each commit.

pushing

before try pushing code, recommend talking co-workers contribution guidelines repository. example, may want push branch or go through code review process.


Comments

Post a Comment

Popular posts from this blog

jquery - How can I dynamically add a browser tab? -

since using iframes house external pages are, accounts "not preferred method" , disallowed sites (flickr, one), want dynamically generate browser tabs. e.g., when user submits form, want dynamically generate tab on browser in response submitted. e.g., might want add new tab url like: http://www.bigsurgarrapata.com/contact how in jquery? you want form target attribute action attribute. http://www.w3schools.com/tags/att_form_target.asp browsers have ultimate control on result of target attribute open new tab value of _blank. <form action="contact_submit.php" target="_blank" method="post">
Read more

node.js - Getting the socket id,user id pair of a logged in user(s) -

i have web application done using node js , in it,i have authentication system requires users log in before can access pages. have 2 pages,the homepage , updates page. from read docs,a new socket id issued when user opens tab in browser. me being admin,i know socket id of logged in user , more so,the socket id,logged in user id pair logged in users. what method can use socket id,logged in user id pair make sure broadcast realtime info users online?.
Read more

keyboard - C++ GetAsyncKeyState alternative -

i using windows.h library's getasynckeystate function define key pushed on keyboard . here program returns int value of pushed key example. #include <iostream> #include <windows.h> using namespace std; int main (){ char i; for(i=8;i<190;i++){ if(getasynckeystate(i)== -32767){ cout<<int (i)<<endl; } } return 0; } but trying make opengl simple game , function appeared slow . there function not need cycle 180 times , if statement . thanks you're trying make opengl game, you're going use glfw. if that's case can away using glfwgetkey() such: if (glfwgetkey(glfw_key_up) == glfw_press) {...} if (glfwgetkey(glfw_key_down) == glfw_press) {...} that method nicely explained in tutorial 6 opengl-tutorial.org . should start first tutorial of beginners tutorials , later intermediate tutorials . if you're going make win32 window can listen wm_keydown or wm_keyup messages , virtua
Read more