From: bankadmin <ban...@gm...> - 2011-11-20 14:24:21
|
Dear Udai, thank you very much. hope Jon will manage now. george. p.s. Andre&Jon , the page you sent is only page you fixed, or you have more pages? On 11/20/2011 1:13 PM, Udai Gupta wrote: > Jon, > > Your patch applies fine, there are no issues in applying the patch. > > here is the output of "git am" http://pastebin.com/raw.php?i=2TExwPXL, > warnings are fine, although you can avoid those. > > I haven't looked at the content of the patch yet. > > About 65 commits ahead of origin/master problem. > > To check what commit you have that does not exist in origin/master. > > git checkout master > git pull origin/master > git log origin/master..master (check output of this) > git log master..origin/master (check output of this) > http://book.git-scm.com/3_reviewing_history_-_git_log.html > > To reset your master same as origin/master > NOTE: make sure you save whatever change you want or working on. > git checkout g-maint (move to another branch) > git branch -D master (delete local master repository not code) > git checkout master (checkout master again) > > after this git status would nothing to commit (ahead or behind). > > Apply your change on master that you have saved before cleanup. > > Udai > > ------------------------------------------------------------------------------ > All the data continuously generated in your IT infrastructure > contains a definitive record of customers, application performance, > security threats, fraudulent activity, and more. Splunk takes this > data and makes sense of it. IT sense. And common sense. > http://p.sf.net/sfu/splunk-novd2d > Mifos-developer mailing list > mif...@li... > Unsubscribe or change settings at: > https://lists.sourceforge.net/lists/listinfo/mifos-developer |