From: Igor Djordjevic <igor.d.djordjevic@gmail.com>
To: Josef Wolf <jw@raven.inka.de>
Cc: git@vger.kernel.org
Subject: Re: Need help migrating workflow from svn to git.
Date: Fri, 15 Dec 2017 02:17:40 +0100 [thread overview]
Message-ID: <b25a828f-3f0a-7c0e-6722-9521238ce7f3@gmail.com> (raw)
In-Reply-To: <5eb3fe18-864d-0b04-223e-d9e5cbf2c81e@gmail.com>
On 14/12/2017 23:27, Igor Djordjevic wrote:
>
> As you basically have a flow where two users (you and cron job) can
> edit same files at the same time, desired outcome might be a bit
> ambiguous, especially when scheduled execution of those files is
> added to the mix.
This said, and without having you to change your habits too much (nor
use Git in possibly awkward ways), I`m thinking you may actually
benefit of using `git worktree add <temp_copy_path>`[1] to create a
temporary working tree ("working copy", as you say), alongside a
temporary branch, where you could hack and test as much as you want,
unaffected by cron job updating and executing the original working
copy/branch (also not stepping on cron job`s toes yourself).
Once you`re satisfied and you commit/merge/push your changes from
within the temporary working copy/branch, you can just delete it
(both temporary working copy and its branch), and you`re good :)
p.s. Even if you`re not familiar with Git branching and merging, it
shouldn`t take too much effort to wrap your head around it, and it`s
definitely worth it - and actually pretty easy, even more if you`re
working alone.
[1] https://git-scm.com/docs/git-worktree
next prev parent reply other threads:[~2017-12-15 1:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-14 13:09 Need help migrating workflow from svn to git Josef Wolf
2017-12-14 21:07 ` Randall S. Becker
2017-12-15 10:27 ` Josef Wolf
2017-12-14 22:27 ` Igor Djordjevic
2017-12-15 1:17 ` Igor Djordjevic [this message]
2017-12-15 13:06 ` Josef Wolf
2017-12-15 12:47 ` Josef Wolf
2017-12-15 18:24 ` Igor Djordjevic
2017-12-15 16:33 ` Junio C Hamano
2017-12-15 18:58 ` Igor Djordjevic
2017-12-15 19:09 ` Junio C Hamano
2017-12-15 19:20 ` Igor Djordjevic
2017-12-20 11:52 ` Josef Wolf
2017-12-20 11:43 ` Josef Wolf
2017-12-20 12:19 ` Josef Wolf
2017-12-21 22:04 ` Igor Djordjevic
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b25a828f-3f0a-7c0e-6722-9521238ce7f3@gmail.com \
--to=igor.d.djordjevic@gmail.com \
--cc=git@vger.kernel.org \
--cc=jw@raven.inka.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).