-

   rss_rss_hh_new

 - e-mail

 

 -

 LiveInternet.ru:
: 17.03.2011
:
:
: 51

:


[] Redmine,

, 05 2017 . 07:18 +


: Redmine. -. Redmine. Redmine . , , Rails-, .


, Redmine, , .


? .


--


Bitnami Redmine, . ? . , , Bitnami . , . . , , , , . .


Redmine . , , ?


, : . , Redmine (, ). Redmine Rails , Bitnami ?




. .




, Redmine . , , Redmine.


, Redmine .


Git


Redmine - , Git Redmine. , ( ). ( ) - , . git c Redmine. .


Redmine Subversion, Github , . :


Redmine


$ git clone git@github.com:redmine/redmine.git
$ cd redmine
$ git remote rename origin upstream
$ git remote add origin git@yourserver.com:redmine.git
$ git checkout -b redmine/3.2-stable upstream/3.2-stable
$ git checkout -b local/3.2-stable
$ git push --set-upstream origin local/3.2-stable

3.2-stable Redmine.


git@yourserver.com , ( , , ). , , . , -, . .


:
redmine/3.2-stable, Redmine 3.2 github/redmine, ,
local/3.2-stable, , , .



Redmine : xyz Major/Minor/Patch. , ( , ). 3.2-stable.


. local/3.2-stable .


, git rebase Redmine:


Redmine:


$ git checkout redmine/3.2-stable
$ git pull                          # new upstream commits coming in
$ git checkout local/3.2-stable
$ git rebase redmine/3.2-stable

rebase:


  • local/3.2-stable.
  • local/3.2-stable, , redmine/3.2-stable.
  • .

, () () Redmine.



, (, 3.3-stable), . git - :



$ git fetch upstream
$ git checkout -b redmine/3.3-stable upstream/3.3-stable
$ git checkout -b local/3.3-stable local/3.2-stable
$ git rebase --onto redmine/3.3-stable redmine/3.2-stable local/3.3-stable

3.3: , 3.2. redmine/3.3-stable. redmine/3.2-stable local/3.3-stable ( - redmine/3.2-stable). local/3.3-stable Redmine 3.3 .


.


, !


(, ) . Git , . git status .


, , , ( ), , git add , . , , , git diff --cached. , git rebase --continue.


, , --abort, .


?


, Git , , (: ).



  1. Deploy and maintain Redmine the right way
Original source: habrahabr.ru (comments, light).

https://habrahabr.ru/post/329872/

:  

: [1] []
 

:
: 

: ( )

:

  URL