git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: kiranpyati <kiran.pyati@infobeans.com>
To: git@vger.kernel.org
Subject: Sync production with Git
Date: Wed, 8 Aug 2012 06:11:24 -0700 (PDT)	[thread overview]
Message-ID: <1344431484059-7564617.post@n2.nabble.com> (raw)

I am new to github,

Earlier we used to manually upload files on the production through FTP
although git was present on the production. Due to this now git status shows
many modified and untrack files.

To sync that with git we have downloaded all files from production and
committed to git. Now git has all files same as production.

We have not pulled on production since last 6 months and because of this it
shows modified and untracked files.

Now if we pull on the production there any 100% chances of the conflict
happened on all modified files. As there are hundreds of modified files
since last since month. Git pull will show conflict to all those files. In
that case site will get down and we can not afford this.

We want a way to seamlessly sync production and Git.

Can anybody please help me on this?

Thanks in advance..!!



--
View this message in context: http://git.661346.n2.nabble.com/Sync-production-with-Git-tp7564617.html
Sent from the git mailing list archive at Nabble.com.

             reply	other threads:[~2012-08-08 13:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-08 13:11 kiranpyati [this message]
2012-08-08 14:20 ` Sync production with Git Matthieu Moy
2012-08-08 22:35   ` David Aguilar
2012-08-09  3:46   ` Drew Northup
2012-08-09  4:21 ` demerphq
2012-08-09  4:25   ` demerphq

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1344431484059-7564617.post@n2.nabble.com \
    --to=kiran.pyati@infobeans.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).