[Archive] Using Git(Hu/La)b
[Archive] Using Git(Hu/La)b
Original source
Hey!
As most of modding/server software is, thankfully, open source, I've accumulated some questions about using services like GitHub:
- Let's say I have "cloned" a repository to my computer, and now it has been changed on GitHub. How can I update the one I cloned, instead of deleting it and cloning the whole repository again?
- Suppose that the repository in the question above is a server (e.g. trinitycore), and after I cloned it, I edited the code to fit my personal needs. How can I do the updating (see the previous question) without overwriting my own edits?
rektbyfaith
06-10-2017, 05:48 PM #1Archived author: Смердокрыл • Posted: 2017-06-10T17:48:29+00:00
Original source
Hey!
As most of modding/server software is, thankfully, open source, I've accumulated some questions about using services like GitHub:
- Let's say I have "cloned" a repository to my computer, and now it has been changed on GitHub. How can I update the one I cloned, instead of deleting it and cloning the whole repository again?
- Suppose that the repository in the question above is a server (e.g. trinitycore), and after I cloned it, I edited the code to fit my personal needs. How can I do the updating (see the previous question) without overwriting my own edits?
Original source
`git pull`
`git stash; git pull; git stash pop`
You should probably fork, do commits and merge though.
rektbyfaith
06-10-2017, 05:53 PM #2Archived author: wungasaurus • Posted: 2017-06-10T17:53:00+00:00
Original source
`git pull`
`git stash; git pull; git stash pop`
You should probably fork, do commits and merge though.
Original source
Quote: Just now, wungasaurus said:*Rolls eyes*
You should probably fork, do commits and merge though.
*Saliva dripping on the floor*
*Unintelligible noises*
rektbyfaith
06-10-2017, 05:57 PM #3Archived author: Смердокрыл • Posted: 2017-06-10T17:57:14+00:00
Original source
Quote: Just now, wungasaurus said:*Rolls eyes*
You should probably fork, do commits and merge though.
*Saliva dripping on the floor*
*Unintelligible noises*
Original source
How did you clone in the first place?
rektbyfaith
06-10-2017, 06:33 PM #4Archived author: wungasaurus • Posted: 2017-06-10T18:33:40+00:00
Original source
How did you clone in the first place?
Original source
Quote: 11 minutes ago, wungasaurus said:Rmb -> GitExt Clone... > *insert details* > Clone
How did you clone in the first place?
rektbyfaith
06-10-2017, 06:45 PM #5Archived author: Смердокрыл • Posted: 2017-06-10T18:45:35+00:00
Original source
Quote: 11 minutes ago, wungasaurus said:Rmb -> GitExt Clone... > *insert details* > Clone
How did you clone in the first place?
Original source
Quote: 55 minutes ago, wungasaurus said:
`git pull`
![[Image: vBEM6-W32hA.jpg]](https://pp.userapi.com/c639130/v639130607/294cc/vBEM6-W32hA.jpg)
Quote: 51 minutes ago, Смердокрыл said:
*Rolls eyes*
*Saliva dripping on the floor*
*Unintelligible noises*
rektbyfaith
06-10-2017, 06:48 PM #6Archived author: Смердокрыл • Posted: 2017-06-10T18:48:24+00:00
Original source
Quote: 55 minutes ago, wungasaurus said:
`git pull`
Quote: 51 minutes ago, Смердокрыл said:
*Rolls eyes*
*Saliva dripping on the floor*
*Unintelligible noises*
Original source
Quote: On 10.06.2017 at 9:48 PM, Смердокрыл said:Could someone please explain how this works?
rektbyfaith
07-20-2017, 07:46 PM #7Archived author: Смердокрыл • Posted: 2017-07-20T19:46:55+00:00
Original source
Quote: On 10.06.2017 at 9:48 PM, Смердокрыл said:Could someone please explain how this works?
Original source
Quote: 17 minutes ago, Смердокрыл said:Click "pull".
Could someone please explain how this works?
rektbyfaith
07-20-2017, 08:04 PM #8Archived author: wungasaurus • Posted: 2017-07-20T20:04:35+00:00
Original source
Quote: 17 minutes ago, Смердокрыл said:Click "pull".
Could someone please explain how this works?
Original source
Quote: 8 minutes ago, wungasaurus said:I mean, which merge options should I use to get the desired result?
Click "pull".
rektbyfaith
07-20-2017, 08:13 PM #9Archived author: Смердокрыл • Posted: 2017-07-20T20:13:16+00:00
Original source
Quote: 8 minutes ago, wungasaurus said:I mean, which merge options should I use to get the desired result?
Click "pull".
Original source
Likely, the defaults are already fine. What _is_ your desired result?
rektbyfaith
07-20-2017, 08:26 PM #10Archived author: wungasaurus • Posted: 2017-07-20T20:26:58+00:00
Original source
Likely, the defaults are already fine. What _is_ your desired result?
1 Guest(s)
1 Guest(s)