| 1 |
On 02/07/14 23:25, François Bissey wrote: |
| 2 |
> On Wed, 02 Jul 2014 15:12:27 Justin wrote: |
| 3 |
>> On 02/07/14 13:32, Jauhien Piatlicki wrote: |
| 4 |
>>> Hi, |
| 5 |
>>> |
| 6 |
>>> On 07/02/2014 01:19 PM, François Bissey wrote: |
| 7 |
>>>> Consider that I am the village idiot, you have to explain to me how you |
| 8 |
>>>> integrated the two branches that each had a commit that the other didn’t |
| 9 |
>>>> have. |
| 10 |
>>> |
| 11 |
>>> quite simple ;-) |
| 12 |
>>> |
| 13 |
>>> consider you have two branches in your local repo: github-master and |
| 14 |
>>> gentoo-master, and you have two remotes: github and gentoo. Then you do |
| 15 |
>>> |
| 16 |
>>> something like: |
| 17 |
>>> git checkout github-master |
| 18 |
>>> git pull |
| 19 |
>>> git checkout gentoo-master |
| 20 |
>>> git pull |
| 21 |
>>> |
| 22 |
>>> Now your local branches are in sync with remote, you can do merging |
| 23 |
>>> |
| 24 |
>>> git checkout github-master |
| 25 |
>>> git merge gentoo-master |
| 26 |
>>> git push github github-master:master |
| 27 |
>>> |
| 28 |
>>> git checkout gentoo-master |
| 29 |
>>> git merge github-master |
| 30 |
>>> git push gentoo gentoo-master:master |
| 31 |
>>> |
| 32 |
>>> You can do it with less commands, but I've written it this way, so |
| 33 |
>>> everything should be completely clear. ) |
| 34 |
>>> |
| 35 |
>>> Regards, |
| 36 |
>>> Jauhien |
| 37 |
>> |
| 38 |
>> Hey guys, |
| 39 |
>> |
| 40 |
>> as I wrote some month ago, I placed a script into the script dir called |
| 41 |
>> "merge-dualHEAD" which we can use for syncing. |
| 42 |
>> |
| 43 |
> |
| 44 |
> Can we put a note on the github wiki about it then? Because I remembered there |
| 45 |
> was something on the mailing list but yes it was months ago. Possibly a couple |
| 46 |
> of years even. |
| 47 |
> |
| 48 |
> Francois |
| 49 |
> |
| 50 |
|
| 51 |
It is already there |
| 52 |
|
| 53 |
https://github.com/gentoo-science/sci/blob/master/CONTRIBUTING.md |
| 54 |
|
| 55 |
Jusitn |
Archives