Re: more git weirdness (git rebase, merge conflicts

2013-03-28 Thread Magnus Bäck
On Wednesday, March 27, 2013 at 14:51 EDT, "J.V." wrote: > I have a local/development branch tracked to origin/development. I > made no changes to local/dev and did a git pull with rebase, I did > not expect any conflicts. > > I got a conflict and was thrown onto another branch. I attempt

more git weirdness (git rebase, merge conflicts

2013-03-27 Thread J.V.
I have a local/development branch tracked to origin/development. I made no changes to local/dev and did a git pull with rebase, I did not expect any conflicts. I got a conflict and was thrown onto another branch. I attempted a merge (using IntelliJ) accepting everything from the server but a