sPHENIX tracking discussion

["Frawley, Anthony" <afrawley AT fsu.edu>]

Hi Martin,

Yes, you are right. The pulls are not done correctly. They do not (at least 
not always) update things in the local file that were changed in the 
repository by someone else. Then when you do a push, the change that was not 
propagated to your file is reversed, because it looks like you changed it 
back! I just had this happen again. When I tried to reinstate the change in 
my local file and push it to the master, git told me everything was up to 
date. I ended up having to edit the file directly on the Overleaf web site to 
fix it.

Making a fresh clone before making any changes will work, as long as no one 
edits the same file while you are working on it. 

Not so great.

Thanks
Tony

________________________________________
From: sphenix-tracking-l-bounces AT lists.bnl.gov 
[sphenix-tracking-l-bounces AT lists.bnl.gov] on behalf of Martin Purschke 
[purschke AT bnl.gov]
Sent: Saturday, October 17, 2015 7:54 PM
To: sphenix-tracking-l AT lists.bnl.gov
Subject: Re: [Sphenix-tracking-l] Issue with pCDR figures

Tony,

this git-web divide seems to get many people into an endless loop. I
think the vast majority of us are using git and are working locally, but
I believe that the remote git setup isn't doing the pulls right.
Virtually every commit I made led to actual merges and git fast-forwards
in the n-1 chapters that I didn't touch at all, which is usually a sign
that someone is not using git right.

It's totally clunky and against the spirit of git, but what got me out
of numerous deadlock situations is that I manually moved my modified
files out of my local pCDR tree, nuked it, made a fresh clone, and then
moved the modified files back in place to commit them.

Maybe it helps.


Best,
        Martin


On 10/17/15 18:57, Frawley, Anthony wrote:
> Hi All,
>
> I never did figure out how to get the git bridge to upload the new
> figure versions. I ended up using the interface on the Overleaf web page
> to overwrite the files. Now they appear correctly in the document.
>
> I am thinking that I should give up on using the GitHub bridge to
> Overleaf and switch to using the web interface.
>
> Cheers
> Tony
>
> ------------------------------------------------------------------------
> *From:* Frawley, Anthony
> *Sent:* Saturday, October 17, 2015 4:42 PM
> *To:* sphenix-tracking-l AT lists.bnl.gov
> *Cc:* Frawley, Anthony
> *Subject:* Issue with pCDR figures
>
> Hi All,
>
> I have several figures in the silicon tracking simulations section that
> I pushed to the master repository last night. However the figures that
> appear in the document posted by John, and in the pdf file produced on
> Overleaf, are the older versions that should have been replaced by the
> ones I pushed last night.
>
> Git thinks my area is up to date with the master, my local versions of
> the figures are the new ones, but the versions in the repository are the
> older versions.
>
> Is there a way to examine the history of file commits so that I can try
> to diagnose this? How do I get at the history information that I would
> see if I could look at the repository on a Github web page? The Overleaf
> web page does not seem to contain such information - or I don't know how
> to access it.
>
> Thanks
> Tony
>
>
>
> _______________________________________________
> Sphenix-tracking-l mailing list
> Sphenix-tracking-l AT lists.bnl.gov
> https://lists.bnl.gov/mailman/listinfo/sphenix-tracking-l
>


--
Martin L. Purschke, Ph.D.        ;   purschke AT bnl.gov
                                 ;   http://www.phenix.bnl.gov/~purschke
                                 ;
Brookhaven National Laboratory   ;   phone: +1-631-344-5244
Physics Department Bldg 510 C    ;   fax:   +1-631-344-3253
Upton, NY 11973-5000             ;   skype: mpurschke
-----------------------------------------------------------------------
_______________________________________________
Sphenix-tracking-l mailing list
Sphenix-tracking-l AT lists.bnl.gov
https://lists.bnl.gov/mailman/listinfo/sphenix-tracking-l