From: brett l. <bre...@gm...> - 2011-09-19 21:50:03
|
Adam - Not quite, but close enough for me to apply. I've pushed your change. In the future, try this: $ git pull --rebase $ git format-patch HEAD^ Google up those commands and check out the associated 'git <command> --help' manual pages for more details. ---Brett. On Mon, Sep 19, 2011 at 5:04 PM, Adam Badura <ab...@o2...> wrote: > Here you go another try. > Most likely I have to read more about GIT but for now (compared to SVN) it > is not very clear... > > Also in attachement a save which shows that there is something not right > with New York tile as NYC trains do not want to visit that city... I will > have a look at that issue but no promises. > > -----Oryginalna wiadomość----- From: brett lentz > Sent: Monday, September 19, 2011 10:49 PM > To: Development list for Rails: an 18xx game > Subject: Re: [Rails-devel] Another correction for Wabash > > Adam - > > Your patch doesn't apply cleanly. Can you double-check to make sure > your HEAD is up-to-date? (i.e. do a "git pull" and regenerate your > patch) > > ---Brett. > > > > 2011/9/19 Adam Badura <ab...@o2...>: >> >> >> ------------------------------------------------------------------------------ >> 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. Business sense. IT sense. Common sense. >> http://p.sf.net/sfu/splunk-d2dcopy1 >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel >> >> > > ------------------------------------------------------------------------------ > 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. Business sense. IT sense. Common sense. > http://p.sf.net/sfu/splunk-d2dcopy1 > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > ------------------------------------------------------------------------------ > 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. Business sense. IT sense. Common sense. > http://p.sf.net/sfu/splunk-d2dcopy1 > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > > |