I am working on a tilebased RPG with a friend of mine who has to go away for weeks and we decided it was time to use version control/git. I am starting to regret that. After a few hours we managed to get it working to the point where:
Essentially we are locked with a project he can update and I cannot. I am the repo owner if that matters at all.
On trying to "Fetch from upstream":
On trying to "Pull":
On commit&push:
We are pretty much stuck now. We rather not use skype to send files, at some point we are going to be professionals and that seems too tedious.
As requested:
The error message "This branch is not configured for pull" in EGit is typical of a branch created locally and pushed.
That wouldn't set the merge section of that branch.
See "The current branch is not configured for pull No value for key branch.master.merge
found in configuration"
[branch "master"]
remote = origin
merge = refs/heads/master
To solve that, one way is to rename your current master
branch, and, in the Git Repositories
view:
Branches
" / "Switch to
" / "New Branch
"Source ref
" list, select "master
" branch (pull strategy "merge
", "Checkout new branch
" checked)finish
"The new branch should be correctly configured
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With