To get out of this state… pick the branch that you believe is the most correct (local, Github, SVN) and then (assuming you’ve chosen your local) you can force-push (git push origin master—force to completely overwrite the remote.
I have been using the “git push origin master—force” and it has resolved my issues. Thank you very much for the help!
Thank you very much for the in-depth response! I greatly appreciate it… I’m fairly new to any type of SVN or GIt workflow, so even trying to Google search this stuff is somewhat confusing.
To clarify a bit on what I was doing, I only started trying to use the rebase after I was getting the fast forward errors… just to try something different to see if I could get it to work. There must be something that gets modified on Github after the push to the WP SVN. I do have a handful of other projects I’m syncing with Github that are not being synced to the WP SVN which work seemlessly (I have never run into the Fast Forward issue).
My normal workflow is:
1. Make changes to my project locally, then in Terminal 2. $ git status (to double-check the changed files 3. $ git commit -am “Put my note here” 4. $ git push
At this point, my non-WP SVN projects update on GItHub as expected, but this is where my WP SVN projects run into the Fast Forward error.
But, I will take a look through the links you provided and try the force push to GitHub as I am the only one working with the repository and my projects.
I am new to using GitHub and followed the instructions here https://gist.github.com/kasparsd/3749872 to setup all of my free plugins on GitHub. The initial process went fairly smoothly (to get them setup). But now whenever I want to updated my plugins I get some Fast Forward error, and the I try to run a combination of git pull to update my local files, which sometimes works… or I try a git svn rebase and a pull… Not sure what I’m doing, but I basically just get myself into a huge mess of errors.
If I spend 1/2 hour or more trying to do a simple update and get past all the errors (by doing a combination of random git commands) I can usually get it to go through and update the WP SVN, but I know there’s got to be a better way of doing this.
Does anyone know of a resource that has a better explanation of how to keep my local repository updated with what’s on GitHub and WP, and make a smoother experience with this?
I’m not sure how it gets out of sync as I am the only one who modifies, adds, and commits files for any of my projects… Plus, I keep it simple and only have a Master branch (as I need to figure out the basics before I dive into diverging branches).
I know that being an Exclusive Author means you can not sell your item on other sites, but I would like some clarification on the following scenario:
Could I run a promotion on my own site that gives one of my files away for FREE that I sell exclusively on Envato?
If I recall correctly, there used to be authors who did a “Buy 1, Get 1 Free” promotion on ActiveDen years ago.
Thanks for any clarification on this.
I think that the safest way is not using the XML import feature. Include a couple of images on the theme folder, add them to the library and generate your content with some of the Wordpress functions.
It may take one or two hours more to build, but then you will not have any support related with this type of feature
I have thought about doing this as well… but was hoping to not have to resort to that.
Thank you for the response! Would you mind if I borrowed some of your reply in my own support threads?
I had previously assumed there wasn’t much to do about the failed imports (based on prior research) and it sounds like that’s still the case. I wasn’t sure if anyone had solve the riddle of why it happens from time to time.
Does anyone have any tips for users running into failed media imports when attempting to import sample content for a theme?
It seems to be random as everything imports fine with multiple tests I’ve run on multiple servers and sites, but some user’s get failed media imports every time they attempt to import the file. I have even logged into a buyers dashboard after they have had failed media imports and was able to get successful media imports when I attempted the import.
I am at a loss at to what advice I can give users when they run into this issue. Thanks ahead of time for any help on with this issue.
Glad to see the update.
I had originally written a much longer post with some arguments in it, but I’ve cut most of it out… There are still a few things that I think would be very beneficial to the community concerning this whole support debacle.
1. Envato needs to spend the time and money to build and host a complete and functional support system for all of us to use. Something that integrates completely with our products, with buyer licenses, and any other pertinent info that makes managing a support system for Envato products easier to maintain. As a whole, the author community has wasted millions of hours, each of us coming up with our own support systems. Just setting up a support system alone is a huge task… and if you want to integrate it with the API and sales data that a whole other huge undertaking. Envato could have a single, centralized support system will all the bells and whistles that we can just “use”. How nice would that be!
2. Envato should employ a support staff to answer basic HTML, CSS, WordPress, etc. support questions (and give authors a quick button in “Envato’s new wonderful support system” to push these questions off to) so authors don’t need to support questions that are “general” questions… We should only need to answer questions that pertain to our specific files.
3. There should be a full set of FAQs on Envato for all the major project categories that we can link to for general question as well… Even if it’s an author populated archive. Just something that we can all use without each author having to create their own on their own support system.
There’s probably a whole slew of other things that Envato could do “for the authors” to help us optimize our time, create better files, create better customer relationships, and generate more money for everyone. But it seems all the burden and expectations gets put on authors, with limited resources and time, trying to figure these things out flying by the seat of our pants.