[nama] Re: Can't switch to dev branch (even though repo newly cloned)
- From: "S. Massy" <lists@xxxxxxxxxxxx>
- To: nama@xxxxxxxxxxxxx
- Date: Thu, 24 May 2012 14:31:23 -0400
On Thu, May 24, 2012 at 08:11:51PM +0200, Julien Claassen wrote:
> Hi everyone!
> did anyone else experience that (Massy?):
> git pull origin dev
> [lots of merging and then conflicts]
> CONFLICT (content): Merge conflict in src/IO.p
> CONFLICT (add/add): Merge conflict in src/mt
> Automatic merge failed; fix conflicts and then commit the result.
> I'm sure, tat the problems are small, can you either fix it or is
> there a way to quickly see the offending lines or get a suggestion,
> what might be done?
All Okay here. Are you sure you weren't trying to merge dev into master?
Cheers,
S.M.
Other related posts: