Re: [lmi] Branching to replace XSL-FO

[Greg Chicares]

On 2017-10-06 21:51, Vadim Zeitlin wrote:
> On Fri, 6 Oct 2017 20:53:37 +0000 Greg Chicares <address@hidden> wrote:
[...]
> GC> Later, while I'm working on the 'gwc-no-xslfo' branch, from time to time
> GC> I'll want to get any updates you've made to the remote.
> 
>  The command to do that is just
> 
>       $ git fetch vz-remote
> 
> (you could add the branch name to fetch just the direct-pdf-gen-branch, but
> it doesn't cost much to omit it). This doesn't modify your local branches
> in any way but it does update vz-remote/direct-pdf-gen-master branch.
> [...] And if/when you want to update vz-no-xslfo to
> correspond to the latest remote branch state you would do
> 
>       $ git checkout vz-no-xslfo
>       $ git merge --ff-only vz-remote/direct-pdf-gen-master

That's the 'git merge command' that I had previously tried:

> GC> $ git merge --ff-only vz-remote/direct-pdf-gen-master
> GC> fatal: Not possible to fast-forward, aborting.
> 
>  I think it doesn't work because you're not on the right branch, i.e. your
> current branch is "gwc-no-xslfo", which can't be fast-forwarded because
> this branch forks off from the latest master while vz-no-xslfo starts from
> slightly earlier master, and not "vz-no-xslfo" for which this really should
> work.

In order to get your changes from yesterday, I tried this:

$git checkout vz-no-xslfo                           
Switched to branch 'vz-no-xslfo'
Your branch is up-to-date with 'vz-remote/direct-pdf-gen-master'.
$git merge --ff-only vz-remote/direct-pdf-gen-master 
Already up-to-date.

but that didn't recognize your latest changes, so I tried this:

$git fetch vz-remote
remote: Counting objects: 454, done.
remote: Compressing objects: 100% (182/182), done.
remote: Total 454 (delta 282), reused 444 (delta 272), pack-reused 0
Receiving objects: 100% (454/454), 175.26 KiB | 320.00 KiB/s, done.
Resolving deltas: 100% (282/282), completed with 11 local objects.
>From https://github.com/vadz/lmi
 + 1513e0376...0c85a7a99 direct-pdf-gen-master -> 
vz-remote/direct-pdf-gen-master  (forced update)

That command apparently did something. I guess "forced update" indicates
that you rebased your branch to bring in changes I had made through
2017-10-06T17:32:15Z. However, now if I repeat the git-merge command,
it fails:

$git merge --ff-only vz-remote/direct-pdf-gen-master
fatal: Not possible to fast-forward, aborting.

I guess this means that 'git merge --ff-only' is incompatible with the
"forced update". But what am I supposed to do now?
 - git reset --hard vz-remote/direct-pdf-gen-master
 - git rebase vz-remote/direct-pdf-gen-master
 - or repeat the 'git merge' command without '--ff-only'?