I also like to use `git rebase` for the situation where you are trying to keep a separate branch "in-sync" with a master line of development. To me that makes the history easier to read, but YMMV.
--- A. Soroka The University of Virginia Library > On Feb 14, 2017, at 5:55 AM, Andy Seaborne <[email protected]> wrote: > > Awesome! > > On 13/02/17 22:04, Claude Warren wrote: >> As Mentioned earlier Java 9, Java 9 no longer has external jar files. They >> are all binaries. Not sure how to fix this issue. >> >> [ERROR] Failed to execute goal on project jena-elephas-common: Could not >> resolve dependencies for project >> org.apache.jena:jena-elephas-common:jar:3.3.0-SNAPSHOT: Could not find >> artifact jdk.tools:jdk.tools:jar:1.6 at specified path >> /usr/lib/jvm/java-9-openjdk-amd64/../lib/tools.jar -> [Help 1] >> >> I will continue to work through the rest of the builds. >> >> I will check the code into git hub tomorrow. I have to figure out how to >> do that in a way that will allow me to keep it in sync with the main >> repository. > > # Pull from one remote - push to another. > git pull https://git-wip-us.apache.org/repos/asf/jena.git master > git push > > or add an entry in .git/config for the remote: > > [remote "apache"] > url = https://git-wip-us.apache.org/repos/asf/jena.git > fetch = +refs/heads/*:refs/remotes/origin/* > > and > > git pull apache master > git push > > ("origin" and "master" etc aren't really built into git except as defaults in > the commands so keeping repos in step is the same process just with different > remote and branch.) > > Andy > >> >> Claude >> >>
