On Wednesday, April 1, 2020 at 8:05:28 AM UTC-5, Thomas Passin wrote:
>
> OK, I'll take a run at it. It can be difficult when you have a lot of
> changes that are mostly whitespace and style.
>
Just make sure there are no merge markers like <<, == and >>.
Somebody can beautify the
OK, I'll take a run at it. It can be difficult when you have a lot of
changes that are mostly whitespace and style. I messed one up that way
recently, too.
On Wednesday, April 1, 2020 at 6:34:20 AM UTC-4, Edward K. Ream wrote:
>
> Somehow it contains many conflict markers from a git merge.
>
It's always annoying when there are a lot of whitespace and style changes.
I'll see about it.
(For the benefit of anyone else who is wondering what this is about, this
commit tried to remove a lot of complaints from pylint about whitespace
and other sylistic nits that had build up over the
On Wednesday, April 1, 2020 at 5:34:20 AM UTC-5, Edward K. Ream wrote:
>
> Somehow it contains many conflict markers from a git merge.
>
It should be easy for you. From a branch that contains your desired vr3.py:
- git merge devel (Will likely create a merge conflict).
- git checkout --ours
