Accept the remote's changes - git pull
When there is a conflict, let the version on the remote repo win:
$ git pull -X theirs
Renaming a branch
The first command just renames it locally, the second publishes that new branch name while the third command deletes the old branch on the remote. The last command is for pointing the upstream marker to the correct branch on the remote.
$ git branch -m <current name> <new name>
$ git push origin <new name>
$ git push origin :<current name>
$ git branch --set-upstream-to=origin/<new name>
Deleting a (remote) branch
The first command deletes the branch locally and the second "pushes" the delete to the reomote server.
$ git branch -D <branch name>
$ git push origin --delete <branch name>
Deleting a (remote) tag
$ git tag -d <tag>
$ git push origin :refs/tags/<tag>
Set up your own a git repository on your server
This is how you set up your own git repository on Unix/Linux server with SSH access.
Locally on your laptop
First set up git in your local project source folder:
$ cd ~/src/myproject
$ git init
$ find . | xargs git add
$ git commit
...write a nice commit message
Then, create a git repo directory structure based on your sources
(we always call this something ending with.git
$ cd ~/src/
$ git clone --bare myproject myproject.git
Copy it to your server, e.g.:
$ scp -r ~/src/myproject.git ssh://user@myserver:~/src/
You (and your colleagues) can now use it on your machine(s):
$ cd ~/src
move the old sources out of the way just in case: $ mv myproject myproject.orig
then, fetch them from the server:
$ git clone ssh://user@myserver:~/src/myproject.git
You can now work as you're used to with e.g. github,git pull, git push
will all work as you're used to.
