Re: [be] Send/Receive error message

[Teus Benschop]

Normally Bibledit-Gtk resolves these differences automatically by taking
either the text that was 'on the server', or else taking the 'local
version'. This follows the settings made when the collaboration was set
up. That will be the reason that these two options no longer are
visible. Teus

On Thu, 2010-12-09 at 21:38 -0600, Oreo Warpok wrote:
> How will the two options appear? 
> Will there be a box that will show up?
> Sounds like the two options would appear in the normal window in USFM.
> Very strange. Nothing is there now.
> And today I did not get those messages when I did Send/Receive.
> 
> 
> Phil
> 
> On Thu, Dec 9, 2010 at 8:07 AM, Teus Benschop <address@hidden>
> wrote:
>         Is the text of Ephesians chapter 1 still right? If not, then
>         there will
>         be two options given somewhere in that chapter, best viewed in
>         USFM
>         view. After choosing one option, and editing the text, and
>         saving it,
>         then Send/Receive probably will work again. Teus
>         
>         
>         On Wed, 2010-12-08 at 10:14 -0600, Oreo Warpok wrote:
>         > In doing a Send/Receive with our remote repository, I got
>         this error:
>         >
>         >
>         >                 Already up-to-date.
>         >                 Everything up-to-date
>         >                 /home/oreo/.bibledit/projects/TSI
>         master/data
>         >                 # On branch master
>         >                 # Changes to be committed:
>         >                 #   (use "git reset HEAD <file>..." to
>         unstage)
>         >                 #
>         >                 # modified:   Ephesians/1/data
>         >                 #
>         >                 [master a20df70] commit
>         >                 1 files changed, 1 insertions(+), 1
>         deletions(-)
>         >                 Auto-merging Ephesians/1/data
>         >                 CONFLICT (content): Merge conflict in
>         Ephesians/1/data
>         >                 Automatic merge failed; fix conflicts and
>         then commit
>         >                 the result.
>         >                 >From
>         >
>         ssh://tsederhana.git.sourceforge.net/gitroot/tsederhana/tsederhana
>         >                 cdcea43..0aef273  master     ->
>         origin/master
>         >                 To
>         >
>         ssh://address@hidden/gitroot/tsederhana/tsederhana
>         >                 ! [rejected]        master -> master
>         >                 (non-fast-forward)
>         >                 error: failed to push some refs to
>         >
>         'ssh://address@hidden/gitroot/tsederhana/tsederhana'
>         >                 To prevent you from losing history,
>         non-fast-forward
>         >                 updates were rejected
>         >                 Merge the remote changes before pushing
>         again.  See
>         >                 the 'Note about
>         >                 fast-forwards' section of 'git push --help'
>         for
>         >                 details.
>         >
>         >
>         > It seems that I have been given two things to do, and I
>         can't tell
>         > which is right, or if I should do both. What does "unstage"
>         mean?
>         > And how do I get the remote changes so that I can "merge"
>         them?
>         >
>         >
>         > Phil
>         > --
>         > ===============
>         > Oreo Phil         479-524-7005
>         >                       0857 9631 4790
>         >
>         >       One King to rule them all, One Son to find them,
>         >       One Blood to cleanse them all, And from the dark
>         unbind them.
>         > ===============
>         >
>         >
>         
>         
>         
>         
> 
> 
> 
> -- 
> ===============
> Oreo Phil                 479-524-7005
> 
>       One King to rule them all, One Son to find them,
>       One Blood to cleanse them all, And from the dark unbind them.
> ===============
>