Closed gdotv closed 2 years ago
Apologies, it appears I've messed up linking the issue I've created against janusgraph.org's main repository, it's https://github.com/JanusGraph/janusgraph.org/issues/93.
Hey I've just realised this fell off my plate for a while. I've fixed the conflict with the latest version on the Key Lines link (was https://cambridge-intelligence.com/visualizing-janusgraph-new-titandb-fork on my version, updated to https://cambridge-intelligence.com/keylines/janusgraph as seen on master). Can this be looked into for merge/deploy? Could definitely use a direct link from janusgraph's website!
Cheers, Arthur
Hey Arthur, thanks for getting back on this. I actually also forgot about this completely. I could have just merged it in January already. Sorry for that!
Could you please delete your last commit here where you merged master
into your own branch and instead rebase on master?
The steps for rebasing should be simply:
git rebase origin/master
# fix merge conflicts
git push -f
Hey Florian, thanks for getting back so quick. I think this should do it this time? Let me know. Apologies, I'm still not super familiar with these processes so I hope I did all this right!
Unfortunately this still doesn't look good. There's still a merge conflict and 2 commits instead of just one. Could you please try the following steps?
First ensure that you are on your feature branch and have the latest changes from the JanusGraph repo (assuming that it's called origin
):
git checkout gdotv-readme
git fetch origin
Save your own changes so you can apply them back later:
git reset HEAD~2
git stash
Rebase on master
from origin
to get the latest changes in:
git rebase origin/master
Apply your own changes that you saved in step 2. You may need to resolve merge conflicts here:
git stash apply
After you have resolved merge conflicts, create a new commit:
git commit -s
Force push your updated branch which should now have just one commit on top of master
:
git push -f
Since your change just changes a single line, it could also be easier to just do a hard reset instead on master
and then make your change again and commit & force push that.
In that case, it should just be:
git checkout gdotv-readme
git fetch origin
git reset --hard origin master
# apply your change
git commit -s
git push -f
Hey sorry, I'm a mess! That should be it now on 1 commit, no conflicts, etc.
No problem. Everything looks good now, so I'm merging this.
Added G.V() - Gremlin IDE to the support visualization tools.