Help using GIT

[drakylucas]

Can someone explains me how to use GIT in some situations?
I have my custom repository at bitbucket with my server (with few modifications on sources, lua, etc), and I want to get all the latests updates from TFS repository (on github).

What exactly I need to do in order to apply the recent updates automatically?


I don't know much about git :c
I have few different things in my sources, (but I used TFS as base, so the only modification I have, I made by myself), so I think I wouldn't have any problem with the difference in the code.

 

[Raggaer]

This covers anything about git

Git - Getting Started

Usually the most common command you use are

git commit -m "Message --all

git push

But git is very big and there a lot of commands (like branchs for examples) so just follow the getting started section of the git website.

Usually you fork a project (tfs) you can rebase to get the latest TFS commits while keeping your changes

 

[drakylucas]

This covers anything about git

Git - Getting Started

Usually the most common command you use are

git commit -m "Message --all

git push

But git is very big and there a lot of commands (like branchs for examples) so just follow the getting started section of the git website.

Usually you fork a project (tfs) you can rebase to get the latest TFS commits while keeping your changes

Thank you. I'll take a look into it.

Usually, I'm doing only basic things (as you said)

// first time
git status
git init
git remote add origin https://[email protected]/myaccount/mygit.git
git add . // at this time, I had all files of TFS in the current gitbash folder
git commit -a -m "Message here"
git push origin master // put my code on bitbucket

// all times
git status
git add .
git commit -a -m "message"
git push origin master

// to get code from Origin (remote):
git pull

to get the current TFS modification on my custom repository, I tried this:

git remote add parent https://github.com/otland/forgottenserver.git
git pull parent master

and I got this error:

 * branch              master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

then I did this:

git pull --allow-unrelated-histories parent master

and, with some effort fixing the HEAD in my code, it was finally updated.
now, when the TFS updates again, I'll need to redo all the Heads again? or the git is smart enough to keep what I already did and apply only the new differences?

 

[River KA]

You can train some skills on here:
Git Tutorial - Try Git