Git - Help me understand and improve my two-man workflow -


a teammate , (both new git) working on new project. project still in stages of development, changes not @ point can broken well-isolated features.

this our current workflow. (i know it's wrong)...

  • git commit
  • git pull origin
  • git push origin

i'm having trouble understanding results in following scenario...

  • i commited small change locally
  • my teammate made series of commits , pushed origin
  • i finished working on, commited again
  • i pulled in changes, , pushed origin

afterwards, expected diff show changes, since that's what's new origin. instead, see teammates changes added code. in addition, teammate received errors when trying pull (did not record them, unfortunately), , had clone things working right again.

to make things expected in first place, (after searching around stackoverflow)...

  • git reset --hard
  • git checkout <teammates last commit>
  • git merge <my last commit>
  • git push

first, i'd understand happened. second, i'd know better approach going forward.

without more information on errors were, it's hard why occurred. may binary files modified (this causes git errors), lots of other things, too.

it sounds me git working correctly: last change did pull in teammate's changes, , that's reflected in recent git diff. want pull before doing commit, make sure you're working date version of repository. also, diff command works on commit history; when pushed origin irrelevant.

in future, may want working branches. if each have own branch, can use git rebase pull in changes have been made master branch before committing modifications. working local branches makes collaborating easier, because don't have worry committing changes aren't yet ready prime time master branch. nice tutorial on branching can found at: http://git-scm.com/book/en/git-branching-basic-branching-and-merging. i've found useful in past.


Comments

Post a Comment

Popular posts from this blog

blackberry 10 - how to add multiple markers on the google map just by url? -

i have android application, want convert blackberry 10 , google map needed in app,but blackberry 10 not support googlemap , blackberry developer web site supply way replace it.the sample below: @override public void oncreate(bundle savedinstancestate) { super.oncreate(savedinstancestate); setcontentview(r.layout.main); webview webview = (webview) findviewbyid(r.id.mywebview); webview.getsettings().setjavascriptenabled(true); webview.loadurl("http://maps.google.com/?ll=36.97, -122&lci=bike&z=13&t=p"); } i cannot understand it,i not know how add multiple markers on googlemap via url? can me? this worked me map shown in webview.
Read more

php - guestbook returning database data to flash -

i've been struggling problem long , unable make work, hope can me it. first, know php files correct , mysql database works fine. in flash, able submit comment database comments not display. did many tests such making returned_database flash separately , worked fine - can see old comments. long combine submitting 1 , returning 1 together, flash doesn't show comments more. put lower version flash effects on frame thinking doesn't collaborate returning flash, submitting flash works fine. since pretty complex problem hard me copy actionscript code because on different frames in flash. if has ideas fixing maybe can send file you?
Read more

delphi - Dynamic file type icon -

i want register file type in windows , make program delphi draw icon of file according contents (something custom icon format). how can this? thanks nortd , user539484 comments, searched internet "shell icon handler delphi" , found sample here , , shell+ components has component this.
Read more