From: Alister P. <gsp...@gm...> - 2015-01-05 06:04:55
|
Hi Adam, As you have kindly offered… I’ve made two commits since updating (recently) from exist develop. The first of these is “8fe9eebf5a49a95bd1857d6d67c7d48a92c6f4b8”. So I think the rebase command should be git rebase —onto ac160ba32bfb721abe120ec558ca3f22eeb63c5c 8fe9eebf5a49a95bd1857d6d67c7d48a92c6f4b8~1 Does that look correct? (I am tempted to start again by cloning from develop.) Prior to running this I’ll need to deal with the uncommitted changes - which is where I’ve been uncertain for a while. In my working directory, git status shows as modified all the lib/core/*.jar files. Are these modified when signing the code? How should I deal with them prior to running rebase? Thanks, Alister. On 5 Jan 2015, at 10:48 am, Adam Retter <ad...@ex...> wrote: > > Any questions, about adjusting your fork/clone branches, please just > ask, I would like this to be as painless for everyone as possible. > > Cheers Adam. > > -- > Adam Retter > > eXist Developer > { United Kingdom } > ad...@ex... > irc://irc.freenode.net/existdb > > ------------------------------------------------------------------------------ > Dive into the World of Parallel Programming! The Go Parallel Website, > sponsored by Intel and developed in partnership with Slashdot Media, is your > hub for all things parallel software development, from weekly thought > leadership blogs to news, videos, case studies, tutorials and more. Take a > look and join the conversation now. http://goparallel.sourceforge.net > _______________________________________________ > Exist-development mailing list > Exi...@li... > https://lists.sourceforge.net/lists/listinfo/exist-development |