[orion-dev] Can't fast-forward and can't merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[orion-dev] Can't fast-forward and can't merge

From: John J Barton <johnjbarton@xxxxxxxxxxxxxxx>
Date: Mon, 29 Aug 2011 09:48:17 -0700
Delivered-to: orion-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/orion-dev>
List-help: <mailto:orion-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/orion-dev>, <mailto:orion-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/orion-dev>, <mailto:orion-dev-request@eclipse.org?subject=unsubscribe>

I seem to have gotten stuck, but I don't know if this is a bug or missing features.

I can't succeed at git push to github because REJECTED_NONFASTFORWARD. I can't merge back from github, the UI just seem to refresh with no error or change (well this much is surely a bug).

Any hints? I'll copy and paste as work around.

jjb

Follow-Ups:
- Re: [orion-dev] Can't fast-forward and can't merge
  - From: Tomasz Zarna

Prev by Date: Re: [orion-dev] 2 problems with git-status.html
Next by Date: Re: [orion-dev] manifest.json
Previous by thread: [orion-dev] manifest.json
Next by thread: Re: [orion-dev] Can't fast-forward and can't merge
Index(es):
- Date
- Thread

Breadcrumbs