This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: git-svn error due to out-of-sync changes?


On 05/18/2017 11:41 AM, Martin Sebor wrote:
> I just tried to push a change and got the error below.  git
> pull says my tree is up to date.  I wonder if it's caused by
> my commit conflicting with another commit (in this case
> r248244) that git-svn doesn't see because it lags behind SVN.
> I brushed this (and other strange errors) off before, not
> bothering to try to understand it but it's happened enough
> times that I'd like to bring it up.  I expect some (maybe
> even most) of these issues would not exist if we were using
> Git directly rather than the git-svn wrapper. Has any more
> progress been made on the Git integration project?  Is there
> something I/we can do to help get it done?
That just means something changed upstream betwen your last git svn
rebase and your local commit.

Just "git svn rebase", resolve conflicts (the ChangeLogs are the most
common source of conflicts)  and you should be good to go.

jeff


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]