Good vs. Evil
- Thread starter Randomguy404
- Start date
-
The FTB Forum is now read-only, and is here as an archive. To participate in our community discussions, please join our Discord! https://ftb.team/discord
88 you know, I forgot one thing when I decided to use my own server instead of github for the school project. I have no idea how to merge a branch using the command line >_>
I guess it will be something like git merge {branch1} {branch2}
(in before it is giant command that takes 2 lines )
I guess it will be something like git merge {branch1} {branch2}
(in before it is giant command that takes 2 lines )
87 for the school projects we need to use git. Which is not a problem, especially as teachers seem to like github. (which is awesome). However due to the fact that my project need a lot of placeholder images (I will add 38 new ones soon) which I am not even going to try and get the rights for due to only placeholders putting it on github isn't exactly something I want to do. (I know it isn't exactly that much of a problem but still its not something I want to do).
Another reason is that we need to put the project on a server before showing our progress and thus having the git hosted on the same server will make that process a lot faster.
And before anyone asks, yes the server is currently online (not sure if I already put the project on it though) I am however not going to give the ip adress to anyone.
Another reason is that we need to put the project on a server before showing our progress and thus having the git hosted on the same server will make that process a lot faster.
And before anyone asks, yes the server is currently online (not sure if I already put the project on it though) I am however not going to give the ip adress to anyone.
84 @lenscas: I don't know for sure, but I *think* git merge will merge a named branch into the current branch. So if you've got a testing branch and you want to merge your changes into master, you would do
git checkout master
git merge testing
I *highly* recommend checking man git-merge and/or the Internet before typing either of these commands. I'm probably doing something wrong.
git checkout master
git merge testing
I *highly* recommend checking man git-merge and/or the Internet before typing either of these commands. I'm probably doing something wrong.
89 @Someone Else 37 I already expected something like that. And yes, I am defiantly looking at the internet first. But first, I need to finish the creation of the database entries