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
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
2 matches
Mail list logo