Hi Josef,
On 20/12/2017 12:43, Josef Wolf wrote:
>
>> $ git add -u
>> $ git reset
>
> This would be added after the "git checkout -m -B master FETCH_HEAD"
> command?
Yes, so it would be something like this:
git fetch origin master && #1
git checkout -m -B master
On Wed, Dec 20, 2017 at 12:43:37PM +0100, Josef Wolf wrote:
> Thanks to you both for your patience with me. Sorry for the late reply, my day
> job was needing me ;-)
>
> On Fri, Dec 15, 2017 at 07:58:14PM +0100, Igor Djordjevic wrote:
> > On 15/12/2017 17:33, Junio C Hamano wrote:
> > >
> > >
On Fri, Dec 15, 2017 at 11:09:17AM -0800, Junio C Hamano wrote:
> Igor Djordjevic writes:
>
> > Junio, what about consecutive runs, while merge conflicts are still
> > unresolved?
>
> The impression I got was that the original running with svn does not
> deal with
Thanks to you both for your patience with me. Sorry for the late reply, my day
job was needing me ;-)
On Fri, Dec 15, 2017 at 07:58:14PM +0100, Igor Djordjevic wrote:
> On 15/12/2017 17:33, Junio C Hamano wrote:
> >
> > $ git fetch
> > $ git checkout -m -B FETCH_HEAD
For some reason,
On 15/12/2017 20:09, Junio C Hamano wrote:
>
> > Junio, what about consecutive runs, while merge conflicts are still
> > unresolved?
>
> The impression I got was that the original running with svn does not
> deal with conflicting situation anyway, so I did not think about it
> at all, and I
Igor Djordjevic writes:
> Junio, what about consecutive runs, while merge conflicts are still
> unresolved?
The impression I got was that the original running with svn does not
deal with conflicting situation anyway, so I did not think about it
at all, and I
On 15/12/2017 17:33, Junio C Hamano wrote:
>
> $ git fetch
> $ git checkout -m -B FETCH_HEAD
... aaand that`s how you do it[1] without a temporary branch :)
Junio, what about consecutive runs, while merge conflicts are still
unresolved?
Seeing Josef having a pretty relaxed flow,
Hi Josef,
Thank you for your patient answers. From what you said here and in
that other reply[1], it looks like you know what you`re doing, you`re
aware of circumstances, and you still prefer doing it that way.
So, here it goes... :)
On 15/12/2017 13:47, Josef Wolf wrote:
>
> > I`m thinking
Josef Wolf writes:
> With git, by contrast, this won't work. Git will refuse to pull anything as
> long as there are ANY local modifications. The cron job would need to
>
>git stash
>git pull
>git stash pop
I'd assume that this "pull" is expected to be
On Fri, Dec 15, 2017 at 02:17:40AM +0100, Igor Djordjevic wrote:
>
> 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 `[1] to create a
> temporary working tree ("working
Thanks for your input, Igor!
On Thu, Dec 14, 2017 at 11:27:09PM +0100, Igor Djordjevic wrote:
> Aside "update and merge" working copy while you`re hacking on it,
> what happens with "execute" part? It seems really strange that you
> don`t mind cron job running the same scripts which you are
Thanks for your answer, Randall,
On Thu, Dec 14, 2017 at 04:07:15PM -0500, Randall S. Becker wrote:
>
> You might want to consider a slight modification to your approach as
> follows.
> Instead of using git pull, use git fetch.
> Have each system on its own branch (sys1 = my-sys1-branch, for
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
Hi Josef,
I`m not a Git expert, and I know less of Subversion, but following
your explanation, I might try to help, at least until more
experienced people join.
On 14/12/2017 14:09, Josef Wolf wrote:
>
> Every machine has a working copy of the repository in a specific
> directory. A cron job
> On December 14, 2017 8:10 AM, Josef Wolf wrote:
> Subject: Need help migrating workflow from svn to git.
>
> Hello folks,
>
> I am wondering whether/how my mode of work for a specific project
> (currently based on SVN) could be transferred to git.
>
> I have a repository for maintaining
15 matches
Mail list logo