Comments (7)
It depends of which git client you're using. you should be able to get most of the tips from here: http://help.github.com/
from three.js.
I'm reading through it right now! Have never been working with any Version Control System, or Github in particular. If there's anything I don't understand that's relevant to three.js I will post back here.
from three.js.
Okay, so "git fetch origin" and then "git merge origin/master" should do it (provided that my "git remote -v" has "origin https://github.com/mrdoob/three.js.git (fetch)" in it) for a local branch.
However, what if I want to keep my Github fork up to date? Can I do that directly from the webclient? Or should I first locally clone my Github fork, then clone yours into a new local branch, run a merge from your branch into mine, and then pull my local up to my Github fork? (If I understand correctly ;-))
from three.js.
You just need to merge my branch with your local branch.
I recommend you use one of these clients:
- Windows: http://code.google.com/p/tortoisegit/
- MacOS: http://gitx.frim.nl/
- Linux: http://trac.novowork.com/gitg/
It'll make things simpler.
from three.js.
(I use Linux)
I do understand how the merging works (that's the fetch & merge), but the latter part of my question was about the Github fork (exactly this one https://github.com/fabricasapiens/three.js).
I can't merge your repo directly with mine via the webinterface, right?
from three.js.
I use Linux too and I use gitg. As far as I know you can't do too much with the webinterface here.
Trust me, use gitg ;)
from three.js.
I guess I should trust you then ;-) Trying out GitG tomorrow! Thanks for pointing me in the right direction...!
And by the way: the Github help is the best intro into versioncontrol I've ever seen :-)
from three.js.
Related Issues (20)
- Enhance target type for SpotLight and DirectionalLight HOT 1
- Build a grid through custom coordinates HOT 1
- `.equals` in class `Spherical` HOT 6
- FBXLoader loads default Unreal model with wrong rotation HOT 4
- Editor can't import glTF with .ktx2 textures HOT 1
- MRT needs a filter if there are several objects with different shader counts in the scene HOT 3
- File Export Whole Scene feature was removed 😨 HOT 2
- RectAreaLight passes through material HOT 6
- Editor: drop event in UIOutliner of ui.three.js not being call HOT 9
- Editor: Export GLB and GLTF fails to fetch HOT 2
- MeshToonMaterial support for WebGPU
- why my scene can not showed fully, after wheel scale and drag? who can help me? thanks HOT 1
- Black/gray outline shows around transparent textures when mipmaps are used. HOT 4
- MeshPhysicalMaterial: Wrong blending with nested transmissive objects. HOT 11
- Add StorageBufferAttribute to current version of Three.js HOT 1
- Stencil params getting out of sync. HOT 6
- GLTFLoader does not load external ktx2 textures HOT 5
- Material copy function issue HOT 1
- Clipping is not correct when material enables transparent and spot-light casts shadow [WebGPU] HOT 1
- WebGLRenderer: Calling "copyTextureToTexture" on an unused WebGLRenderTarget does nothing HOT 5
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from three.js.