Github "Updates were rejected because the remote contains work that you do not have" -

-

i created new repo, cloned it, added files directory, added them add -a, committed changes, , when try push using git push <repo name> master "updates rejected because remote contains work not have".

this doesn't seem make sense since it's new repo , contains readme file.

this happens if initialized new github repo readme and/or license file

git remote add origin [//your github url]  //pull changes  git pull origin master  //now, push work new repo  git push origin master

now able push repository github. basically, have merge new initialized files work. git pull fetches , merges you. can fetch , merge if suits you.


Comments

Post a Comment

Popular posts from this blog

Using 'OR' and 'AND' in SQL Server -

-
is using ( condition or condition b , condition c ) the same as ( condition , condition c) or (condition b , condition c) no. first condition is: (condition a) or (condition b , condition c) and second is: (condition , condition c) or (condition b , condition c) you can see difference between them.
Read more

python - Finding intersection between ellipse and a line -

-
i trying find intersection points between elipse , line, seem unable so. have tried 2 approaches, 1 shapely trying find intersection between linestring , linearring in code bellow, did not usable values out of it. 1 of problems, elipse off center , @ small or high angle # -*- coding: utf-8 -*- """ created on mon aug 19 17:38:55 2013 @author: adudchenko """ pylab import * import numpy np shapely.geometry.polygon import linearring shapely.geometry import linestring def ellipse_polyline(ellipses, n=100): t = np.linspace(0, 2*np.pi, n, endpoint=false) st = np.sin(t) ct = np.cos(t) result = [] x0, y0, a, b, angle in ellipses: angle = np.deg2rad(angle) sa = np.sin(angle) ca = np.cos(angle) p = np.empty((n, 2)) p[:, 0] = x0 + * ca * ct - b * sa * st p[:, 1] = y0 + * sa * ct + b * ca * st result.append(p) return result def intersections(a, line): ea = linearring(a) eb...
Read more

c++ - NetBeans Remote Development with additional configuration -

-
i'm trying use netbeans (7.3.1) work on remote project. my configuration following: my local machine windows 7 laptop. doesn't have tools. in particular neither compiler nor debugger. have netbeans ide , putty example. source code, make scripts , (eventually) build results located on remote storage shared across servers , "locals". (i might switch single server storage faster don't think matters @ all.) i'm accessing using sshfs manager . sshfs manager takes server name, path on server, user name , ssh private key. in result mounts directory on server disk on windows. works fine. (although directories, possibly links, represented files in windows explorer, don't know if matters...) netbeans project located on local machine don't think matters , place remotely well. prefer keep "off source" don't have add ignores version control. in netbeans did procedure described in remote developement tutorial . seems successful. netbeans c...
Read more