1 |
Hi, |
2 |
|
3 |
after talking to our infra guys and alexxy about it, I came to the point |
4 |
that we should still allow commits to both repos for everyone with |
5 |
commit access. |
6 |
|
7 |
To avoid future trouble here are some rules to stick to. |
8 |
|
9 |
* Don't _amend_ already pushed commits. |
10 |
* Don't _rebase_ already pushed commits. |
11 |
* Don't --force a push. |
12 |
|
13 |
In case you still have problems, then follow this receipt from alexxy. |
14 |
He will write some longer instructions soonish in the wiki. |
15 |
|
16 |
$ git fetch --all (assume that you added github as another upstream. |
17 |
origin is g.o.g.o and github is github) |
18 |
$ git merge github/master |
19 |
$ git push origin |
20 |
that will merge github to g.o.g.o |
21 |
now we should merge g.o.g.o back to github |
22 |
$ git checkout -b github github/master |
23 |
$ git merge origin/master |
24 |
$ git push github HEAD:master |
25 |
$ git checkout master |
26 |
|
27 |
That should fix our problems. |
28 |
|
29 |
Justin |