git pull on repo, local changes?

[Geert Janssens]

Op maandag 30 januari 2017 11:39:15 CET schreef Aaron Laws:
> On Mon, Jan 30, 2017 at 11:08 AM, John Whitmore <arigead at gmail.com> wrote:
> > I've built GnuCash from source on my Linux machine, installing to /opt
> > using a
> > prefix in the build process. That was weeks ago and I decided that I'd
> > better
> > pull, for recent goodness, and build again.
> > 
> > I'm hit with a rather long list of local changes when I try to 'git pull'
> > have
> > I done something wrong or should those files be in a .gitignore file?
> > 
> > $ git status | more
> > 
> > On branch maint
> > Your branch is behind 'origin/maint' by 22 commits, and can be
> > fast-forwarded.
> > 
> >   (use "git pull" to update your local branch)
> > 
> > Changes not staged for commit:
> >   (use "git add <file>..." to update what will be committed)
> >   (use "git checkout -- <file>..." to discard changes in working
> >   directory)
> >   
> >         modified:   ChangeLog
> > 
> > Untracked files:
> >   (use "git add <file>..." to include in what will be committed)
> >   
> >         gnc-guile
> >         src/app-utils/app-utils.go
> >         src/app-utils/business-options.go
> >         src/app-utils/business-prefs.go
> >         src/app-utils/c-interface.go
> >         src/app-utils/config-var.go
> >         src/app-utils/date-utilities.go
> >         src/app-utils/gettext.go
> >         src/app-utils/hooks.go
> >         src/app-utils/migratable-prefs.xml
> >         src/app-utils/migrate-prefs.go
> >         src/app-utils/options.go
> >         src/app-utils/prefs.go
> 
> To avoid this, build "out-of-tree":
> cd gnucash; mkdir build; cd build; cmake .. -G Ninja; ninja check;
> 
> Instead of 'cmake .. -G Ninja', you can issue '../autogen.sh; ../configure;
> make -j 4', or however you want to build.
> 
> Then, to clean your repository, it's as simple as
> cd gnucash; rm -r build;
> 
> Hopefully that's helpful!
> _______________________________________________
> gnucash-user mailing list
> gnucash-user at gnucash.org
> https://lists.gnucash.org/mailman/listinfo/gnucash-user
> -----
> Please remember to CC this list on all your replies.
> You can do this by using Reply-To-List or Reply-All.

I agree to Aaron's suggestion. It will make things easier to update.

For your particular situation now, the only file blocking your fast forward is 
the ChangeLog. I'm not sure why this was updated. It's not too important for a 
locally built gnucash edition though so you could run
git checkout -- ChangeLog
to undo its changes and then rerun git pull.

Regards,

Geert