git remote -v # View existing remotes # origin https://github.com/user/repo.git (fetch) # origin https://github.com/user/repo.git (push) git remote set-url origin https://github.com/user/repo2.git # Change the 'origin' remote's URL git remote -v # Verify new remote URL # origin https://github.com/user/repo2.git (fetch) # origin https://github.com/user/repo2.git (push)
Monthly Archives: October 2013
SVN incoming edit / delete upon merge
- Sometimes when merging in svn, a file has been edited / deleted in both locations. To resolve:
- May look something like:
user@boxname:/opt/repo/deploy$ svn status M . ? target ! C deploy > local delete, incoming edit upon merge ! C foo.py > local delete, incoming delete upon merge D xxx.yml C bar.py > local add, incoming add upon merge
- To resolve, execute for each line:
$ svn resolve --accept working ${filename} - EX:
$ svn resolve --accept working deploy $ svn resolve --accept working foo.py $ svn resolve --accept working bar.py