An cabalistic doubt about rAgit and commits.

[Tales]

When someone send a new commit, he will use the latest with reference?

I hope so ...

Edited October 3, 2014 by Tales

[Winz]

hmm, not quite sure about what your question is.

 

if people typed "git commit", it is kept as-is and is knowledge to be "OK" by the local git client. while committing, users need to enter their comment there.

if people typed "git push", then it will send all changes to the server. OTHERWISE, server ( https://github.com/rathena ) is (of course) allowed and MUST to reject any pushes from people who are not registered as the developer of rAthena.

 

while committing, users are ought to enter the comment on what they have done, alongside with the name of the modified files

 

does this answer your question. maybe?

[Tales]

This give me a additional info about GIT. But dont solve my doubt...

Let me explain it...

Get the latest rAthena Git ( with 12.179 commits)

If one contributor make a modification in GIT he'll add a modification with the latest 12.179 commits?

Other way... supposing that an new contributor make a change on pc.c that a old contributor does in the commit 12.179 the current contributor will modify with the lastest or they uses different branches?

 

I say all it because when i update my git, some modifications cannot be found because dont exists on my git.

 

 

Sorry for kill the English.

[Winz]

If one contributor make a modification in GIT he'll add a modification with the latest 12.179 commits?

>> yes

 

Other way... supposing that an new contributor make a change on pc.c that a old contributor does in the commit 12.179 the current contributor will modify with the lastest or they uses different branches?

>> I would say, when the current contributor pushes the changes, GIT will tell him that the file was already modified.

e.g:

pc.c's version is 1.0.0. then, Contributor A made changes.

during the same time, Contributor B has changed pc.c AND pushed it.

server will keep note on the version, changing it to 1.0.1 (or whatever)

then, when Contributor A do GIT PUSH, GIT will check the original file, if it is the same or not. since Contrib A's pc.c version is 1.0.0 and the one on server is already 1.0.1, Contributor A's push will be declined and he will be notified.

 

Usually, "git push" refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it.

[Tales]

You is the man!

[Winz]

Thanks!

 

are*