Subject:*
Name/Email:*
Message Icon:*
Message:*
url email imgsrc image php hide code quote
English Nederlands 
SAMPLE
alignleft aligncenter alignright bold italic underline linethrough   


 [more...]
Options:*
 

 

 
     
Re: Git repository changes - moving branches

by skenow on 2023/11/25 7:43:11

It did take me a few attempts to find the best way to accomplish this realignment in my local and remote repos, so I thought I'd share. And, since I haven't use the git command line much, I was working through Eclipse to figure it out. Following the steps above will also make sure you have the latest from the ImpressCMS repository - less to have to compare and merge into your repository.


Re: Git repository changes - moving branches

by fiammybe on 2023/11/25 6:36:46

Thanks for the clear explanation on what to do!


Git repository changes - moving branches

by skenow on 2023/11/24 20:15:35

There have been some changes you'll need to adjust your forks and local repositories to stay in sync with the core repository (https://github.com/ImpressCMS/impresscms). What was the 2.0.x branch is now labeled TNG (as in 'The Next Generation') and what was the 1.5.x branch is now the 2.0.x branch. This is to keep in line with the realization we had about the work done and the original scope we had for 2.0. David laid it all out in this post  - Version reshuffle. This renaming of the branches in git make things a little more clear when doing work for the various releases.

If you have forked ImpressCMS to work on it, the easiest thing to do is

  1. Delete the 2.0.x branch from your remote repository
  2. Delete the 2.0.x branch from your local repository
  3. Check out the new TNG branch from the ImpressCMS repository to your local repository
  4. Push that branch to your remote repository
  5. Do the same for the 1.5.x branch, except the new branch is what is now 2.0.x in the ImpressCMS repository

Alternatively, for moving the 2nd branch (1.5.x to 2.0.x), you could delete 1.5.x from your remote, rename your local 1.5.x branch to 2.0.x, and then push it to your remote. Your remote branch may still have a different upstream branch in the ImpressCMS repository.

If you have any branches that were created from either of those that you are still working in, you will need to update their upstream branch to point to the newly named branch.

If you don't delete the previous 2.0.x branch and the 1.5.x branch from both your remote and your local repository, you'll run into conflicts and potential duplication of branches.