• Announcements

    • khawk

      Download the Game Design and Indie Game Marketing Freebook   07/19/17

      GameDev.net and CRC Press have teamed up to bring a free ebook of content curated from top titles published by CRC Press. The freebook, Practices of Game Design & Indie Game Marketing, includes chapters from The Art of Game Design: A Book of Lenses, A Practical Guide to Indie Game Marketing, and An Architectural Approach to Level Design. The GameDev.net FreeBook is relevant to game designers, developers, and those interested in learning more about the challenges in game development. We know game development can be a tough discipline and business, so we picked several chapters from CRC Press titles that we thought would be of interest to you, the GameDev.net audience, in your journey to design, develop, and market your next game. The free ebook is available through CRC Press by clicking here. The Curated Books The Art of Game Design: A Book of Lenses, Second Edition, by Jesse Schell Presents 100+ sets of questions, or different lenses, for viewing a game’s design, encompassing diverse fields such as psychology, architecture, music, film, software engineering, theme park design, mathematics, anthropology, and more. Written by one of the world's top game designers, this book describes the deepest and most fundamental principles of game design, demonstrating how tactics used in board, card, and athletic games also work in video games. It provides practical instruction on creating world-class games that will be played again and again. View it here. A Practical Guide to Indie Game Marketing, by Joel Dreskin Marketing is an essential but too frequently overlooked or minimized component of the release plan for indie games. A Practical Guide to Indie Game Marketing provides you with the tools needed to build visibility and sell your indie games. With special focus on those developers with small budgets and limited staff and resources, this book is packed with tangible recommendations and techniques that you can put to use immediately. As a seasoned professional of the indie game arena, author Joel Dreskin gives you insight into practical, real-world experiences of marketing numerous successful games and also provides stories of the failures. View it here. An Architectural Approach to Level Design This is one of the first books to integrate architectural and spatial design theory with the field of level design. The book presents architectural techniques and theories for level designers to use in their own work. It connects architecture and level design in different ways that address the practical elements of how designers construct space and the experiential elements of how and why humans interact with this space. Throughout the text, readers learn skills for spatial layout, evoking emotion through gamespaces, and creating better levels through architectural theory. View it here. Learn more and download the ebook by clicking here. Did you know? GameDev.net and CRC Press also recently teamed up to bring GDNet+ Members up to a 20% discount on all CRC Press books. Learn more about this and other benefits here.
Sign in to follow this  
Followers 0
blueshogun96

Pushing changes to github?

5 posts in this topic

I'm posting this here, because I don't know where I'd post this.

 

I'm a complete n00b to github, and I can't get the thing to work to save my life.  So, I found this tutorial and followed it *almost* to the T (I added a few source files to the mix).  So, here I am at the very last step (git push origin master) , and I get this error message:

 

 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/blueshogun96/KunaiEngine.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 
What?  I just created this stupid thing!  What is it talking about?
 
If it matters, I'm using MacOSX and doing everything using the terminal (please, no OSX trolling).  Any ideas?  Thanks.
 
Shogun.
0

Share this post


Link to post
Share on other sites
The error message is essentially saying that someone else pushed a change to github (including you, if you used a different computer), and the branch you're trying to push does not yet include the other person's changes. If you force push, the other person's changes will be lost.

Fetch, then Rebase master onto origin/master (resolve conflicts if there are any), then Push. // This moves your work so that it comes after the other person's work in the commit graph.

Alternatively:

Pull and resolve conflicts, then Push (this makes more of a mess out of the git log though) // This merges your commit with the other person's commit and makes a merge node in the commit graph.


You may have to repeat the process if the other person/people push new commits in the meantime.

In order to get the syntax right for each command, you should refer to the git documentation while you do it. I don't personally use the command line because it's fairly easy to accidentally make a typo and do something COMPLETELY different than what you want, so I don't remember the proper command line argument order to use. Edited by Nypyren
0

Share this post


Link to post
Share on other sites

No idea how to do that, or even what it means (fetch and rebase).  I'm still learning what is what.  Sorry if it sounds like I want to be spoon fed, but my brain is all over the place.

 

Shogun

0

Share this post


Link to post
Share on other sites
Try this:

git pull origin master

(solve conflicts/commit if needed)

git push origin master


In the very unlikely case it is the first time you are pushing changes to github, you can erase the project on github, start it again and push to it with --mirror.
0

Share this post


Link to post
Share on other sites
fetch and rebase are both literal names of git commands.

Fetch downloads commits from the remote ("remote" is interchangable with "github server" in this case), updates your local origin/* branches to point at the new commits, then exits. It does not affect your "local" branches.

Rebase copies commits to new locations in the commit graph. You tell it which commits you want to move and where you want to move them to. It has lots of different options, so you should refer to the official documentation on how to use it.


Don't worry if it sounds complicated - it usually takes a few months for an experienced programmer to become familiar with git.

You should really search on the internet for some full-length introductory guides. It takes a very long time to explain all of the information and I would just be totally redundant.
0

Share this post


Link to post
Share on other sites

^ Yeah, but I'd hate to spend my entire 3 day weekend spending all of my time learning git.  But for now, as long as I can push and upload changes, I'm good.

 

Try this:

git pull origin master

(solve conflicts/commit if needed)

git push origin master


In the very unlikely case it is the first time you are pushing changes to github, you can erase the project on github, start it again and push to it with --mirror.

 

This fixed it.  I tried it before, but I didn't do it right.

0

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!


Register a new account

Sign in

Already have an account? Sign in here.


Sign In Now
Sign in to follow this  
Followers 0