[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Paparazzi-devel] Git messed up?
|
From: |
Ben Laurie |
|
Subject: |
[Paparazzi-devel] Git messed up? |
|
Date: |
Sun, 15 Dec 2013 18:01:14 +0000 |
I just tried to rebase my git branch onto master, and I get _loads_ of
merge conflicts for files I've never even looked at, let alone
changed.
Did master get rebased and pushed to github or something?
Because that shouldn't normally happen, should it?
- [Paparazzi-devel] Git messed up?,
Ben Laurie <=