*6924* Overflow on subsequent lines hidden for first column in grid

[jasonheckman]

*Cleaned all extraneous spaces from code.

This should address the overflow issue.

As long as the actual field doesn't exceed 200px (at that point the edit
sprite's background will show a gap.)

A failed routing issue to github yesterday caused some issues with pushing this commit.

[asmecher]

Jason, there seems to be some kind of problem with your branch; the commit can't be automatically merged. Did you change branches or something? Is your repository up to date?

[jasonheckman]

Wtf.

I've been using the same one, it did have weird problems this week though.

I'm wondering if I should dump it and try again? It tells me everything is up to date.

Suggestions?

-----Original Message-----
From: Alec Smecher [mailto:[email protected]]
Sent: Tuesday, April 17, 2012 2:26 PM
To: Heckman, Jason A
Subject: Re: [pkp-lib] 6924 Overflow on subsequent lines hidden for first column in grid (#11)

Jason, there seems to be some kind of problem with your branch; the commit can't be automatically merged. Did you change branches or something? Is your repository up to date?

---

Reply to this email directly or view it on GitHub:
#11 (comment)

[asmecher]

Hard to tell from here; what does your "git status" say? What does it say when you run a "git push"?

[jasonheckman]

Git status says:

On branch dev

Your branch is ahead of 'official/master' by 6 commits.

nothing to commit (working directory clean)

git push origin dev says:
Everything up-to-date

[asmecher]

Maybe you need to pull upstream changes into your local repo from the official master?

[jmacgreg]

Should this pull request be merged/closed?

[asmecher]

Don't merge; I think Chris is currently looking into this one.

[asmecher]

Closed; this is outdated.