Jump to content

GIT 2 Questions Need help


Guest cajkan

Recommended Posts

Hello guys i cant understand abbout git merge

ive found some git users Repositories

lets make example:

Repositorie Script Dev 2 :

im using command : "git clone" for cloning to my PC (downloading)

now inside theres 3 branches

1. Master

2. Scriptdev2

3. Test

owner announced that we need to Merge Master to SD2

Can anyone tell me how to make it ??

EXAMPLE

im using

git clone git://github.com/scriptdev2/scriptdev2.git ( This should be MASTER )

and

git pull scriptdev2 ( Secound branch )

and i get error

" Fatal:scriptdev does not appear to be a git ripostery

fatal : The remote end hung up unexpectedly

can anyone tell me

How to clone Master and then merge it to other branch ???

just like in example Master to ScriptDev2 branches

Thanks

Link to comment
Share on other sites

Hm took me a while to understand whatcha talking about :P

Firstoff if your in src/bindings/ and clone scriptdev2 in your folder (github.com/scriptdev2/scriptdev2 is completely outdated [they don't use this repo any more]), you get a new folder ScriptDev2. Inside of this folder git has informations about the master branch. If you cd inside it 'git branch' shows "* master". There is no other branch, but this master branch.

If you want to pull another branch you need to define first where this branch is located. Something like

cd src/bindings/ScriptDev2
git pull git://github.com/someother/repo.git
// now you have this repo inside your ScriptDev2, next create a branch out of this
git checkout -b newbranchsname

After this you should have two repos. 'git branch' should show "* newbranchsname \\n master".

As alternative you could clone in two different folders and merge these afterwards.

Folder structure: "ScriptDev2" "OtherFolder"

 cd S*
git merge ../OtherFolder

Hth

Skirnir

Link to comment
Share on other sites

×
×
  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use