On Thu, Apr 2, 2009 at 10:59 PM, Tonny Kohar <[email protected]> wrote: > Hi, > > On Thu, Apr 2, 2009 at 6:07 PM, Niclas Hedhman <[email protected]> wrote: >> Could it be due to you don't have the lastest changes from the >> repository? I have been commiting stuff all day. >> > > I think so, because after pull (the master/origin), now I am able to push. > > Just a question, what is the proper step to commit changes into the > git (I have no experience in git) > 1) git pull > 1a) conditional depend the pull have conflict or not, if yes then > resolve the conflict > 2) git commit > 3) git push > > Is that correct ?
Yes, I think it is. I think we are all learning here... Cheers -- Niclas Hedhman, Software Developer http://www.qi4j.org - New Energy for Java I live here; http://tinyurl.com/2qq9er I work here; http://tinyurl.com/2ymelc I relax here; http://tinyurl.com/2cgsug _______________________________________________ qi4j-dev mailing list [email protected] http://lists.ops4j.org/mailman/listinfo/qi4j-dev
