Geek Answers Handbook

The main problems of git

Situation

I have never used git or any other version control before. Now I have a web project that should have a stable and developed version, both of which work on the same server in different directories.

  • Stable: /var/www/afod/afod
  • Development: /var/www/afod_dev/afod

Now I want to use git to synchronize changes with the dev version to the stable version, and since I have never used VC systems before, it seems to me that it doesn’t work out how to do this.

What i have done so far

I created a git repository in /var/www/afod/afodand cloned it into a dev directory via:

cd /var/www/afod_dev/afod
git clone /var/www/afod/afod

Now I have 2 repositories that I want to synchronize using git on the stable version side.

Problem (s)

2 , web dev. , , git . , - dev-.

, - . , , git, , , , , . , , . , .

Billy Moon

, dev - apache. dev-, , .

, , .

- ? ?

+5
2

, , . . , , . . git checkout <branch_name>, git, , , .

, - . dev web, git merge <branch_to_pull_in>. , . - < git.

, . , .

/var/www/afod/afod. /var/www/afod/afod git checkout web devfolder , dev. git branch ​​ * dev.

, . dev, . , , , dev git checkout web. , git merge dev. web. /var/www/afod/afod git pull. chnages . dev, - , , , .

dev, git checkout dev dev.

+4

More articles:


All Articles