如何确保我运行的是来自 GitHub 的最新版本的代码

Question

I am fairly new to git and am a bit confused as to how to set up my workflow to work in the most convenient way possible.

I am working on my laptop (running OSX) and our much beefier server (running CentOS) through ssh, where I try and run time consuming tests for my Python code. Doing this for a few months I quickly realised that I was having parallel but separate lines of development since the folder structure is quite different.

I have thus taken the time to set up a github repo and cloned it into my laptop. Then I diffed the python files pairwise (server version vs laptop version) manually merged the differences and pushed the files up to Github. Lastly I cloned the repo on the server. Now I have the same version on all three places which is great.

In the future, I would like to avoid the divergence between the different platforms. Ideally I would like to automatically sync the local repo with Github every time I log in (should in theory be possible to do in .bashrc?), and log out, of the server. Essentially I am trying to avoid the chance that I forget manually syncing between the different machines.

How can I achieve this? Are there any potential pitfalls to this strategy?

Answer 1

For git itself, there is no such hooks or settings to automatically sync local repo with remote repo.

The work around is schedule to run a script to sync local repo with remote repo .

The sync script example (sync master branch) as below:

#!/bin/sh

git fetch
flag=0
ahead=$(git log origin/master..master --oneline)
if [[ -z "${ahead// }" ]]; then
  echo "Local repo has no commits un-pushed"
else
  {
    flag=1
    echo "local master branch is ahead of origin/master $flag"
  }
fi
behind=$(git log master..origin/master --oneline)
if [[ -z "${behind// }" ]]; then
  {
    if [ $flag == 0 ]; then
      echo "already sync"
    else
      git push
    fi
  }
else
  {
    if [ $flag == 0 ]; then
      git pull origin master
    else
    {
      git pull origin master --rebase
      git push
    }
    fi
  }
fi
echo "Now the local repo is aync eith remote repo"

To schedule runs the scripts, you can refer:

schedule running a bash shell script in windows

Running .sh every 5 minutes

You can also related issue here .