ubuntu-manual team mailing list archive

[Hannie Dumoleyn <lafeber-dumoleyn2@xxxxxxxxx>]

What happened is this. On May 26 I added screenshots to the Nautilus 
section, and pushed them to revision 49 "Screenshots added to section 
Nautilus". On May 28 you added screenshots to chapter 2, two of them 
being SystemSettings.png and nautilus-home.png, which I had also done in 
revision 49. This is not a great problem, but it is not necessary to do 
the same job twice ;)
What I usually do is this: bzr pull (thus I have the latest revision). 
Then I make the pdf file, check to see if there are changes to be made 
to "my" sections, including screenshots, do the changes, make the pdf 
file again to see if my changes are accepted, and then finally I commit 
and push.
So, the conflict is no big deal.
Greets,
Hannie

Op 29-05-12 16:01, Jim Connett schreef:
> It is entirely possible this is what happened.  Many screenshots were 
> missing in chapter two (and still are, but I've already committed to 
> getting the rest of the shots up by Wednesday).  I simply followed the 
> file names as prescribed in the "missing screenshot" box, grabbed the 
> screenshot, named the file to match what was indicated, put them in 
> the /screenshot folder, committed, and pushed. While I'm not sure how 
> I would have overwritten what may have already been there, it's 
> entirely possible this is what happened.
>
> Odd that you had a conflict!? I compiled with no issues, then 
> committed with no conflicts.  What can I do to resolve this conflict 
> you are seeing?
>
> Let me know.
>
> On Tue, May 29, 2012 at 1:00 AM, Hannie Dumoleyn 
> <lafeber-dumoleyn2@xxxxxxxxx <mailto:lafeber-dumoleyn2@xxxxxxxxx>> wrote:
>
>     Hi Jim,
>     The last revision I pulled (60) gave me a conflict:
>     SystemSettings.png. May I ask if you replaced the screenshot I
>     made and pushed by another one?
>     Greets,
>     Hannie