1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
#######################
#---PULLING CHANGES---#
#######################
#Check if contributors repo is set up as a remote branch on your dev machine:
git remote -v
#If not, add the remote branch and fetch the latest changes:
git remote add -f msuchard git://github.com/msuchard/SPREAD.git
#Check if you already have a local copy of their repo:
git branch -a
#If not, create it and check it out with:
git checkout -b msuchard/master
#If you do already have a local copy of their repo, fetch the latest changes:
git fetch msuchard
#Get their changes into your personal working branch:
git checkout master
git cherry-pick <hash of user's specific changes that they requested you to pull>
#pull it all
git pull msuchard master
git push origin
##########################
#---NEW GIT REPOSITORY---#
##########################
cd /home/filip/Dropbox/JavaProjects/Spread
git init
git remote add origin git@github.com:fbielejec/SPREAD.git
git pull origin master
################
#---REMOVING---#
################
# git rm templates/world_map.txt
###############
#---REMOTES---#
###############
git remote rm phylogeography
git remote add phylogeography git@github.com:phylogeography/SPREAD.git
git push origin master
git remote rm origin
git remote add origin git@github.com:fbielejec/SPREAD.git
git checkout remotes/phylogeography/master
git pull phylogeography
git checkout master
git merge remotes/phylogeography/master
|
